My fix for the previous issue wasn't good enough and broke Auras, fixed it for reals this time