Better way of fixing the mana gem in combat bug