A really ugly fix for NPE on changing spells