Fixed Check for combat