diff --git a/Source/inv.cpp b/Source/inv.cpp
index 9b48191b8..6d515ce7f 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -2543,7 +2543,11 @@ void RemoveScroll(int pnum)
 	for (i = 0; i < plr[pnum]._pNumInv; i++) {
 		if (plr[pnum].InvList[i]._itype != ITYPE_NONE
 		    && (plr[pnum].InvList[i]._iMiscId == IMISC_SCROLL || plr[pnum].InvList[i]._iMiscId == IMISC_SCROLLT)
+#ifndef HELLFIRE
 		    && plr[pnum].InvList[i]._iSpell == plr[pnum]._pRSpell) {
+#else
+		    && plr[pnum].InvList[i]._iSpell == plr[pnum]._pSpell) {
+#endif
 			RemoveInvItem(pnum, i);
 			CalcPlrScrolls(pnum);
 			return;
@@ -2552,7 +2556,11 @@ void RemoveScroll(int pnum)
 	for (i = 0; i < MAXBELTITEMS; i++) {
 		if (plr[pnum].SpdList[i]._itype != ITYPE_NONE
 		    && (plr[pnum].SpdList[i]._iMiscId == IMISC_SCROLL || plr[pnum].SpdList[i]._iMiscId == IMISC_SCROLLT)
+#ifndef HELLFIRE
 		    && plr[pnum].SpdList[i]._iSpell == plr[pnum]._pRSpell) {
+#else
+		    && plr[pnum].SpdList[i]._iSpell == plr[pnum]._pSpell) {
+#endif
 			RemoveSpdBarItem(pnum, i);
 			CalcPlrScrolls(pnum);
 			return;