diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp
index e0c7170c..a2a206a4 100644
--- a/src/audio/sampman_miles.cpp
+++ b/src/audio/sampman_miles.cpp
@@ -1449,10 +1449,10 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
 
 	for ( int32 i = 0; i < _TODOCONST(3); i++ )
 	{
-#ifdef FIX_BUGS
-		slot = (nCurrentPedSlot - i - 1) % ARRAY_SIZE(nPedSlotSfx);
-#else
 		slot = nCurrentPedSlot - i - 1;
+#ifdef FIX_BUGS
+		if (slot < 0)
+			slot += ARRAY_SIZE(nPedSlotSfx);
 #endif
 		if ( nComment == nPedSlotSfx[slot] )
 			return true;
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 7276a895..30efd7f5 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -779,10 +779,10 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
 
 	for ( int32 i = 0; i < _TODOCONST(3); i++ )
 	{
-#ifdef FIX_BUGS
-		slot = (nCurrentPedSlot - i - 1) % ARRAY_SIZE(nPedSlotSfx);
-#else
 		slot = nCurrentPedSlot - i - 1;
+#ifdef FIX_BUGS
+		if (slot < 0)
+			slot += ARRAY_SIZE(nPedSlotSfx);
 #endif
 		if ( nComment == nPedSlotSfx[slot] )
 			return true;