diff --git a/src/d_player.h b/src/d_player.h
index cf5bafd24..1c352e3ea 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -454,6 +454,8 @@ typedef enum
 #define TRICKMOMZRAMP (30)
 #define TRICKLAG (9)
 
+#define TUMBLEBOUNCES 3
+
 //}
 
 // player_t struct for all respawn variables
diff --git a/src/k_kart.c b/src/k_kart.c
index 5b774506b..5b259a050 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2546,7 +2546,7 @@ void K_TumblePlayer(player_t *player, mobj_t *inflictor, mobj_t *source)
 
 static boolean K_LastTumbleBounceCondition(player_t *player)
 {
-	return (player->tumbleBounces > 4 && player->tumbleHeight < 40);
+	return (player->tumbleBounces > TUMBLEBOUNCES && player->tumbleHeight < 40);
 }
 
 static void K_HandleTumbleBounce(player_t *player)
diff --git a/src/k_respawn.c b/src/k_respawn.c
index c05e1262f..ff7830c32 100644
--- a/src/k_respawn.c
+++ b/src/k_respawn.c
@@ -122,8 +122,8 @@ void K_DoIngameRespawn(player_t *player)
 	// If player was tumbling, set variables so that they don't tumble like crazy after they're done respawning
 	if (player->tumbleBounces > 0)
 	{
-		player->tumbleBounces = 3;		// Max # of bounces-1 (so you still tumble once)
-		player->tumbleLastBounce = 0;	// Still force them to bounce at least once for the funny
+		player->tumbleBounces = TUMBLEBOUNCES-1;		// Max # of bounces-1 (so you still tumble once)
+		player->tumbleLastBounce = false; // Still force them to bounce at least once for the funny
 		players->tumbleHeight = 20;		// force tumble height
 	}