Fix Combat Quit