fight bug fix