Fix for combat