diff --git a/Source/items.cpp b/Source/items.cpp
index cbec8f07d..b6bf362f8 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -3536,10 +3536,18 @@ int RndSmithItem(int lvl)
 
 	ri = 0;
 	for (i = 1; AllItemsList[i].iLoc != ILOC_INVALID; i++) {
+#ifdef HELLFIRE
+		if (AllItemsList[i].iRnd && SmithItemOk(i) && lvl >= AllItemsList[i].iMinMLvl && ri < 512) {
+#else
 		if (AllItemsList[i].iRnd && SmithItemOk(i) && lvl >= AllItemsList[i].iMinMLvl) {
+#endif
 			ril[ri] = i;
 			ri++;
+#ifdef HELLFIRE
+			if (AllItemsList[i].iRnd == 2 && ri < 512) {
+#else
 			if (AllItemsList[i].iRnd == 2) {
+#endif
 				ril[ri] = i;
 				ri++;
 			}