Bug fix for bug fix.