Fixing bug 1105304