Roll back previous bug fix