previous bug fix finished