Critical bug fix