Bug fix to the previous bug fix.