diff --git a/gradle.properties b/gradle.properties
index 67dc269..6ab81ff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ yarn_mappings=1.20.1+build.9
 loader_version=0.14.21
 fabric_kotlin_version=1.10.0+kotlin.1.9.0
 
-version=0.3.3
+version=0.3.4
 group=pm.n2
 archives_base_name=tangerine
 
diff --git a/src/main/kotlin/pm/n2/tangerine/managers/PaperClipManager.kt b/src/main/kotlin/pm/n2/tangerine/managers/PaperClipManager.kt
index 4e4d736..648990b 100644
--- a/src/main/kotlin/pm/n2/tangerine/managers/PaperClipManager.kt
+++ b/src/main/kotlin/pm/n2/tangerine/managers/PaperClipManager.kt
@@ -399,7 +399,13 @@ object PaperClipManager : Manager {
         }
 
         val packets = mutableListOf<Packet<*>>()
-        for (i in 0 until floor(diff / MAX_MOVE_PER_PACKET).toInt()) {
+        val moveCount = if (player.hasVehicle()) {
+            floor(diff / MAX_MOVE_PER_PACKET).toInt()
+        } else {
+            stepCount
+        }
+
+        for (i in 0 until moveCount) {
             if (player.hasVehicle()) {
                 // Jank way to represent a VehicleMove packet we shouldn't change pos
                 packets.add(buildVehicleMove(0.0, 0.0, 0.0, 0f, 0f))
@@ -463,9 +469,9 @@ object PaperClipManager : Manager {
             }
 
             if (player.hasVehicle()) {
-                packets.add(buildVehicleMove(to.x, to.y, to.z, player.yaw, player.pitch))
+                packets.add(buildVehicleMove(pos.x, pos.y, pos.z, player.yaw, player.pitch))
             } else {
-                packets.add(PlayerMoveC2SPacket.PositionAndOnGround(to.x, to.y, to.z, player.isOnGround))
+                packets.add(PlayerMoveC2SPacket.PositionAndOnGround(pos.x, pos.y, pos.z, player.isOnGround))
             }
         }