diff --git a/src/map.rs b/src/map.rs
index 7226ac1..29accb8 100644
--- a/src/map.rs
+++ b/src/map.rs
@@ -373,7 +373,7 @@ impl Plugin for MapPlugin {
                 CoreStage::PostUpdate,
                 entity_indexing.system().label(UPDATE_ENTITY_INDEX_LABEL),
             )
-            .add_system_to_stage(CoreStage::Update, add_areas.system())
+            .add_system(add_areas.system())
             .add_system_to_stage(CoreStage::PostUpdate, add_areas.system());
         if config.speak_area_descriptions {
             app.add_system_to_stage(CoreStage::PostUpdate, area_description.system());
diff --git a/src/navigation.rs b/src/navigation.rs
index 6d9ba11..7a7c92e 100644
--- a/src/navigation.rs
+++ b/src/navigation.rs
@@ -439,6 +439,7 @@ where
                 CoreStage::PostUpdate,
                 remove_blocks_motion
                     .system()
+                    .after(crate::map::UPDATE_ENTITY_INDEX_LABEL)
                     .before(UPDATE_COLLISION_INDEX_LABEL),
             )
             .insert_resource(PreviousMonitorsCollisionsIndex::default())
@@ -453,6 +454,7 @@ where
                 CoreStage::PostUpdate,
                 remove_monitors_collisions
                     .system()
+                    .after(crate::map::UPDATE_ENTITY_INDEX_LABEL)
                     .before(UPDATE_COLLISION_INDEX_LABEL),
             )
             .add_system_to_stage(