combat bug fix