combat bug fix 2