Fixed in and out of combat.