Fast bug fix