Quick critical bug fix