diff --git a/gavania-core/src/game/game.rs b/gavania-core/src/game/game.rs
index 388e7d7..28bfc3e 100644
--- a/gavania-core/src/game/game.rs
+++ b/gavania-core/src/game/game.rs
@@ -274,8 +274,6 @@ impl Game {
             });
 
             StrongHandle::new(Game {
-                engine,
-
                 maps: RwLock::new(map_map),
                 black_listed_maps: RwLock::new(black_listed_maps),
                 tiles: RwLock::new(tile_map),
@@ -295,7 +293,7 @@ impl Game {
                 item_system,
 
                 entity_manager: Mutex::new(EntityManager::new(
-                    engine_create_info.asset_directories.entity_file_directory,
+                    engine.settings().entity_directory().clone(),
                 )?),
 
                 settings_file_location: settings.user_settings_file,
@@ -303,6 +301,8 @@ impl Game {
                 slide_images: Mutex::new(HashMap::new()),
 
                 map_info,
+
+                engine,
             })
         };