bonus bug fix