Fixed mistakes in my bug fix