Bug fix for bug caused by previous bug fix.