diff --git a/source/actor.cpp b/source/actor.cpp
index 59edf3e..794c6c8 100644
--- a/source/actor.cpp
+++ b/source/actor.cpp
@@ -371,7 +371,10 @@ namespace actor
                         act->above->push = 0;
                     }
                 }
-                if (act->pos.x<min.x-4) act->pos.x = max.x;
+                if (act->pos.x<min.x-4) {
+                    act->pos.x = max.x;
+                    act->pos.z = room::getDoor(XP)*4;
+                }
 
                 actor::setDirty(act);
             }
@@ -398,7 +401,10 @@ namespace actor
                         act->above->push = 0;
                     }
                 }
-                if (act->pos.x>max.x+4) act->pos.x = min.x;
+                if (act->pos.x>max.x+4) {
+                    act->pos.x = min.x;
+                    act->pos.z = room::getDoor(XN)*4;
+                }
 
                 actor::setDirty(act);
             }
@@ -425,7 +431,10 @@ namespace actor
                         act->above->push = 0;
                     }
                 }
-                if (act->pos.y<min.y-4) act->pos.y = max.y;
+                if (act->pos.y<min.y-4) {
+                    act->pos.y = max.y;
+                    act->pos.z = room::getDoor(YP)*4;
+                }
 
                 actor::setDirty(act);
             }
@@ -452,7 +461,10 @@ namespace actor
                         act->above->push = 0;
                     }
                 }
-                if (act->pos.y>max.y+4) act->pos.y = min.y;
+                if (act->pos.y>max.y+4) {
+                    act->pos.y = min.y;
+                    act->pos.z = room::getDoor(YN)*4;
+                }
 
                 actor::setDirty(act);
             }