Critical bug fix!!