Fixed bug that the previous bug fix introduced.