diff --git a/vehicles/src/main/java/com/sk89q/craftbook/bukkit/VehiclesPlugin.java b/vehicles/src/main/java/com/sk89q/craftbook/bukkit/VehiclesPlugin.java
index c89995b895..f8f07b1d9e 100644
--- a/vehicles/src/main/java/com/sk89q/craftbook/bukkit/VehiclesPlugin.java
+++ b/vehicles/src/main/java/com/sk89q/craftbook/bukkit/VehiclesPlugin.java
@@ -233,10 +233,7 @@ public void onVehicleMove(VehicleMoveEvent event) {
                     && RailUtil.isTrack(event.getTo().getBlock().getTypeId())
                     && event.getVehicle().getVelocity().lengthSquared() > 0) {
                 Vector vel = event.getVehicle().getVelocity();
-                if (vel.getX() > 0) vel.setX(config.minecartConstantSpeed);
-                if (vel.getY() > 0) vel.setY(config.minecartConstantSpeed);
-                if (vel.getZ() > 0) vel.setZ(config.minecartConstantSpeed);
-                event.getVehicle().setVelocity(vel);
+                event.getVehicle().setVelocity(vel.normalize().multiply(config.minecartConstantSpeed));
             }
 
             cartman.impact(event);