Additional fix to mage