diff --git a/localrunner/world/core/game_objects/passenger.py b/localrunner/world/core/game_objects/passenger.py
index e012ef4..105a0dd 100644
--- a/localrunner/world/core/game_objects/passenger.py
+++ b/localrunner/world/core/game_objects/passenger.py
@@ -161,8 +161,12 @@ def on_tick(self):
             if self.elevator.floor == self.floor and self.elevator.is_filling():
                 if self.elevator.x < 0 and self.x > self.elevator.x:
                     self.move(x=sign(self.elevator.x))
+                elif self.elevator.x < 0 and self.x < self.elevator.x:
+                    self.move(x=-sign(self.elevator.x))
                 elif self.elevator.x > 0 and self.x < self.elevator.x:
                     self.move(x=sign(self.elevator.x))
+                elif self.elevator.x > 0 and self.x > self.elevator.x:
+                    self.move(x=-sign(self.elevator.x))
                 elif self.elevator.floor == self.from_floor and self.elevator.can_enter():
                     self.elevator.enter(self)
                     self.state = self.PASSENGER_STATE['using_elevator']