Hard bug fix