diff --git a/src/p_user.c b/src/p_user.c
index dc7ad252a..f499b7ec0 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8394,8 +8394,8 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 	// SRB2Kart: set camera panning
 	if (player->kartstuff[k_drift] != 0)
 	{
-		fixed_t panmax = (camdist/5);
-		pan = min(player->kartstuff[k_driftcharge], K_GetKartDriftSparkValue(player)) * panmax / K_GetKartDriftSparkValue(player);
+		fixed_t panmax = (dist/5);
+		pan = FixedDiv(FixedMul(min((fixed_t)player->kartstuff[k_driftcharge], K_GetKartDriftSparkValue(player)), panmax), K_GetKartDriftSparkValue(player));
 		if (pan > panmax)
 			pan = panmax;
 		if (player->kartstuff[k_drift] < 0)