important bug fix