diff --git a/source/friend/fgary.cpp b/source/friend/fgary.cpp
index 034a3688e..3c0bacaf9 100644
--- a/source/friend/fgary.cpp
+++ b/source/friend/fgary.cpp
@@ -161,7 +161,9 @@ void CNpcGaryFriend::think( int _frames )
 			case COLLISION_TYPE_FLAG_MOVE_LEFT:
 			{
 				conveyorOverride = true;
-				Pos.vx -= 4;
+				int Time = GameState::getFramesSinceLast();
+
+				Pos.vx -= Time;
 
 				break;
 			}
@@ -169,7 +171,9 @@ void CNpcGaryFriend::think( int _frames )
 			case COLLISION_TYPE_FLAG_MOVE_RIGHT:
 			{
 				conveyorOverride = true;
-				Pos.vx += 4;
+				int Time = GameState::getFramesSinceLast();
+
+				Pos.vx += Time;
 
 				break;
 			}
diff --git a/source/platform/pconveyr.cpp b/source/platform/pconveyr.cpp
index 857fb98ee..c46c49e2b 100644
--- a/source/platform/pconveyr.cpp
+++ b/source/platform/pconveyr.cpp
@@ -143,15 +143,17 @@ void CNpcConveyorPlatform::processMovement( int _frames )
 		{
 			if ( distX )
 			{
+				int Time = GameState::getFramesSinceLast();
+
 				moveX = distX;
 
-				if ( moveX > 4 )
+				if ( moveX > Time )
 				{
-					moveX = 4;
+					moveX = Time;
 				}
-				else if ( moveX < -4 )
+				else if ( moveX < -Time )
 				{
-					moveX = -4;
+					moveX = -Time;
 				}
 			}
 			else