diff --git a/src/acs/call-funcs.cpp b/src/acs/call-funcs.cpp
index fa5da2c1c..119238cbe 100644
--- a/src/acs/call-funcs.cpp
+++ b/src/acs/call-funcs.cpp
@@ -1357,7 +1357,7 @@ bool CallFunc_BreakTheCapsules(ACSVM::Thread *thread, const ACSVM::Word *argV, A
 	(void)argV;
 	(void)argC;
 
-	thread->dataStk.push(battlecapsules);
+	thread->dataStk.push(battleprisons);
 	return false;
 }
 
diff --git a/src/k_hud.c b/src/k_hud.c
index 1712838fd..52e54f5ce 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -3746,7 +3746,7 @@ static void K_drawKartMinimap(void)
 				workingPic = kp_capsuleminimap[(mobj->extravalue1 != 0 ? 1 : 0)];
 				break;
 			case MT_CDUFO:
-				if (battlecapsules) //!battleprisons
+				if (battleprisons)
 					workingPic = kp_capsuleminimap[2];
 				break;
 			default:
diff --git a/src/k_hud_track.cpp b/src/k_hud_track.cpp
index d28f32337..9d2e23f23 100644
--- a/src/k_hud_track.cpp
+++ b/src/k_hud_track.cpp
@@ -365,7 +365,7 @@ bool is_object_tracking_target(const mobj_t* mobj)
 	{
 	case MT_BATTLECAPSULE:
 	case MT_CDUFO:
-		return battlecapsules; // battleprisons
+		return battleprisons;
 
 	case MT_SPECIAL_UFO:
 		return true;
diff --git a/src/p_inter.c b/src/p_inter.c
index c7914922c..0486da414 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -636,7 +636,7 @@ static void P_AddBrokenPrison(mobj_t *target, mobj_t *source)
 {
 	(void)target;
 
-	if (!battlecapsules) // !battleprisons
+	if (!battleprisons)
 		return;
 
 	if ((gametyperules & GTR_POINTLIMIT) && (source && source->player))