Fixing bug 666.