Complete previous bug fix