A wonderful bug fix