Temp fix for being stuck in combat