very important bug fix