diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
index 74a91098b18..1efad957904 100644
--- a/src/Application/VersionResolver.php
+++ b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '3f0b5649057005937557917b39212c3a6ac4343d';
+    public const PACKAGE_VERSION = '5cd8ac7e0ef22955fc9db7ff6ac6c34e38217d85';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-05-23 23:26:10';
+    public const RELEASE_DATE = '2023-05-23 23:50:06';
     /**
      * @var int
      */
diff --git a/src/PhpParser/Node/BetterNodeFinder.php b/src/PhpParser/Node/BetterNodeFinder.php
index e2b8b910fb2..9f06995ea38 100644
--- a/src/PhpParser/Node/BetterNodeFinder.php
+++ b/src/PhpParser/Node/BetterNodeFinder.php
@@ -487,16 +487,11 @@ final class BetterNodeFinder
     public function resolvePreviousNode(Node $node) : ?Node
     {
         $currentStmt = $this->resolveCurrentStatement($node);
-        // just added
         if (!$currentStmt instanceof Stmt) {
             return null;
         }
-        // just added
         $startTokenPos = $node->getStartTokenPos();
-        if ($startTokenPos < 0) {
-            return null;
-        }
-        $nodes = $currentStmt->getStartTokenPos() === $startTokenPos ? [] : $this->find($currentStmt, static function (Node $subNode) use($startTokenPos) : bool {
+        $nodes = $startTokenPos < 0 || $currentStmt->getStartTokenPos() === $startTokenPos ? [] : $this->find($currentStmt, static function (Node $subNode) use($startTokenPos) : bool {
             return $subNode->getEndTokenPos() < $startTokenPos;
         });
         if ($nodes === []) {
@@ -518,16 +513,11 @@ final class BetterNodeFinder
     public function resolveNextNode(Node $node) : ?Node
     {
         $currentStmt = $this->resolveCurrentStatement($node);
-        // just added
         if (!$currentStmt instanceof Stmt) {
             return null;
         }
-        // just added
         $endTokenPos = $node->getEndTokenPos();
-        if ($endTokenPos < 0) {
-            return null;
-        }
-        $nextNode = $currentStmt->getEndTokenPos() === $endTokenPos ? null : $this->findFirst($currentStmt, static function (Node $subNode) use($endTokenPos) : bool {
+        $nextNode = $endTokenPos < 0 || $currentStmt->getEndTokenPos() === $endTokenPos ? null : $this->findFirst($currentStmt, static function (Node $subNode) use($endTokenPos) : bool {
             return $subNode->getStartTokenPos() > $endTokenPos;
         });
         if (!$nextNode instanceof Node) {
diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php
index 7bbf8b8be22..bcdf2f64344 100644
--- a/src/Rector/AbstractRector.php
+++ b/src/Rector/AbstractRector.php
@@ -340,12 +340,24 @@ CODE_SAMPLE;
             return $originalNode;
         }
         $refactoredNode = $originalNode instanceof Stmt && $refactoredNode instanceof Expr ? new Expression($refactoredNode) : $refactoredNode;
+        $this->mapStmtKey($originalNode, $refactoredNode);
         $this->updateParentNodes($refactoredNode, $parentNode);
         $this->nodeConnectingTraverser->traverse([$refactoredNode]);
         $this->refreshScopeNodes($refactoredNode, $filePath, $currentScope);
         $this->nodesToReturn[$originalNodeHash] = $refactoredNode;
         return $refactoredNode;
     }
+    private function mapStmtKey(Node $originalNode, Node $refactoredNode) : void
+    {
+        if ($originalNode instanceof Stmt) {
+            $refactoredNode->setAttribute(AttributeKey::STMT_KEY, $originalNode->getAttribute(AttributeKey::STMT_KEY));
+            return;
+        }
+        $currentStmt = $this->betterNodeFinder->resolveCurrentStatement($originalNode);
+        if ($currentStmt instanceof Stmt) {
+            $refactoredNode->setAttribute(AttributeKey::STMT_KEY, $currentStmt->getAttribute(AttributeKey::STMT_KEY));
+        }
+    }
     /**
      * @param mixed[]|\PhpParser\Node $node
      */
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 880bb8c3730..c5e069dc369 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit7a7599ff89b49ab3be26f2efcc6fce43::getLoader();
+return ComposerAutoloaderInitee70436f83d9a4d2f49501fb42c9bc48::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 65303fe1923..0e19d8fdc3d 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit7a7599ff89b49ab3be26f2efcc6fce43
+class ComposerAutoloaderInitee70436f83d9a4d2f49501fb42c9bc48
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ class ComposerAutoloaderInit7a7599ff89b49ab3be26f2efcc6fce43
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit7a7599ff89b49ab3be26f2efcc6fce43', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitee70436f83d9a4d2f49501fb42c9bc48', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit7a7599ff89b49ab3be26f2efcc6fce43', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitee70436f83d9a4d2f49501fb42c9bc48', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit7a7599ff89b49ab3be26f2efcc6fce43::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitee70436f83d9a4d2f49501fb42c9bc48::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit7a7599ff89b49ab3be26f2efcc6fce43::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitee70436f83d9a4d2f49501fb42c9bc48::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index af770ad45a7..fb45bb2a4d7 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit7a7599ff89b49ab3be26f2efcc6fce43
+class ComposerStaticInitee70436f83d9a4d2f49501fb42c9bc48
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3106,9 +3106,9 @@ class ComposerStaticInit7a7599ff89b49ab3be26f2efcc6fce43
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit7a7599ff89b49ab3be26f2efcc6fce43::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit7a7599ff89b49ab3be26f2efcc6fce43::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit7a7599ff89b49ab3be26f2efcc6fce43::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitee70436f83d9a4d2f49501fb42c9bc48::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitee70436f83d9a4d2f49501fb42c9bc48::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitee70436f83d9a4d2f49501fb42c9bc48::$classMap;
 
         }, null, ClassLoader::class);
     }