diff --git a/Source/items.cpp b/Source/items.cpp
index 0fd7f333b..539a369df 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -3742,7 +3742,11 @@ int RndWitchItem(int lvl)
 
 	ri = 0;
 	for (i = 1; AllItemsList[i].iLoc != ILOC_INVALID; i++) {
+#ifdef HELLFIRE
+		if (AllItemsList[i].iRnd && WitchItemOk(i) && lvl >= AllItemsList[i].iMinMLvl && ri < 512) {
+#else
 		if (AllItemsList[i].iRnd && WitchItemOk(i) && lvl >= AllItemsList[i].iMinMLvl) {
+#endif
 			ril[ri] = i;
 			ri++;
 		}