diff --git a/scripts/units/controlled_unit.gd b/scripts/units/controlled_unit.gd
index 2d07c19..94ceadf 100644
--- a/scripts/units/controlled_unit.gd
+++ b/scripts/units/controlled_unit.gd
@@ -26,9 +26,9 @@ func _ready() -> void:
 	assert(selection_sprite != null, "selection_sprite missing!")
 
 	set_selected(false)
-	super._ready()
 	if spawn_pos != null:
 		global_position = spawn_pos
+	super._ready()
 
 
 func _physics_process(delta: float) -> void:
diff --git a/scripts/units/unit.gd b/scripts/units/unit.gd
index 1a036df..9583b86 100644
--- a/scripts/units/unit.gd
+++ b/scripts/units/unit.gd
@@ -11,6 +11,7 @@ var max_wander_interval: float = 5
 var hovered: bool = false
 var is_on_screen: bool = false
 var wandering_timer: float = 0
+var wandering_center: Vector3 = Vector3.ZERO
 
 @onready var hover_sprite: Sprite3D = $HoverSprite
 @onready var nav_agent: NavigationAgent3D = $NavigationAgent3D
@@ -18,7 +19,6 @@ var wandering_timer: float = 0
 @onready var visibility_notifier: VisibleOnScreenNotifier3D = (
 		$VisibleOnScreenNotifier3D
 )
-@onready var wandering_center: Vector3 = global_position
 
 
 func _ready() -> void:
@@ -27,6 +27,7 @@ func _ready() -> void:
 	assert(animation_tree != null, "animation_tree missing!")
 	assert(visibility_notifier != null, "visibility_notifier missing!")
 
+	wandering_center = global_position
 	set_hovered(false)
 	nav_agent.max_speed = MOVE_SPEED
 	nav_agent.velocity_computed.connect(_on_nav_agent_velocity_computed)