diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp
index 3c6e3d34..90b7761e 100644
--- a/desktop_version/src/Entity.cpp
+++ b/desktop_version/src/Entity.cpp
@@ -4343,9 +4343,6 @@ void entityclass::updateentitylogic( int t )
         return;
     }
 
-    entities[t].oldxp = entities[t].xp;
-    entities[t].oldyp = entities[t].yp;
-
     entities[t].vx = entities[t].vx + entities[t].ax;
     entities[t].vy = entities[t].vy + entities[t].ay;
     entities[t].ax = 0;
diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
index 0610dc82..f19a3139 100644
--- a/desktop_version/src/main.cpp
+++ b/desktop_version/src/main.cpp
@@ -417,6 +417,13 @@ int main(int argc, char *argv[])
                         script.run();
                     }
 
+                    //Update old positions of entities - has to be done BEFORE gameinput!
+                    for (size_t i = 0; i < obj.entities.size(); i++)
+                    {
+                        obj.entities[i].oldxp = obj.entities[i].xp;
+                        obj.entities[i].oldyp = obj.entities[i].yp;
+                    }
+
                     gameinput();
                     gamelogic();