Very important bug fix