Fixing bug 15174.