fix combat