Fixing bug 1081898