Another critical bug fix. :)