emergency bug fix