Core/Spell: Critical code fix