diff --git a/Utils/Cursors.cpp b/Utils/Cursors.cpp
index f501cb03..1f312ff1 100644
--- a/Utils/Cursors.cpp
+++ b/Utils/Cursors.cpp
@@ -1892,7 +1892,7 @@ void UpdateAnimatedCursorFrames( UINT32 uiCursorIndex )
 			pCurImage = &( pCurData->Composites[ cnt ] );
 			// Flugente: now using enums instead of hardcoded values
 			//CHRISL: NCTH uses a completely different cursor so if we're in NCTH mode, we want to use different graphics
-			if (UsingNewCTHSystem() == true && uiCursorIndex != 25 && uiCursorIndex != 26 && uiCursorIndex != 28 && uiCursorIndex != 39 && uiCursorIndex != 40 && uiCursorIndex != 42)
+			if (UsingNewCTHSystem() == true && !(uiCursorIndex >= CURSOR_PUNCHRED_ON1 && uiCursorIndex <= CURSOR_PUNCHNOGO_ON2) && !(uiCursorIndex >= CURSOR_KNIFE_HIT_ON1 && uiCursorIndex <= CURSOR_KNIFE_NOGO_ON2))
 			{
 				switch(pCurImage->uiFileIndex)
 				{