diff --git a/system/src/Grav/Framework/Flex/FlexDirectory.php b/system/src/Grav/Framework/Flex/FlexDirectory.php
index a96ff6bed..594c34c3f 100644
--- a/system/src/Grav/Framework/Flex/FlexDirectory.php
+++ b/system/src/Grav/Framework/Flex/FlexDirectory.php
@@ -1054,7 +1054,9 @@ class FlexDirectory implements FlexDirectoryInterface
             $newKey = $object->getStorageKey();
 
             if ($oldKey !== $newKey) {
-                $object->triggerEvent('move');
+                if (method_exists($object, 'triggerEvent')) {
+                    $object->triggerEvent('move');
+                }
                 $storage->renameRow($oldKey, $newKey);
                 // TODO: media support.
             }
diff --git a/system/src/Grav/Framework/Flex/Pages/FlexPageCollection.php b/system/src/Grav/Framework/Flex/Pages/FlexPageCollection.php
index d27321827..fe7a22107 100644
--- a/system/src/Grav/Framework/Flex/Pages/FlexPageCollection.php
+++ b/system/src/Grav/Framework/Flex/Pages/FlexPageCollection.php
@@ -191,7 +191,6 @@ class FlexPageCollection extends FlexCollection
         $keys = $collection->getStorageKeys();
 
         // Assign next free order.
-        /** @var FlexPageObject|null $last */
         $last = null;
         $order = 0;
         foreach ($keys as $folder => $key) {
@@ -203,8 +202,9 @@ class FlexPageCollection extends FlexCollection
             }
         }
 
+        /** @var FlexPageObject|null $last */
         $last = $collection[$last];
 
-        return sprintf('%d.', $last ? $last->value('order') + 1 : 1);
+        return sprintf('%d.', $last ? $last->getFormValue('order') + 1 : 1);
     }
 }