Fixing bug 1081898

Please review the change and comment if anything else needs to be done.