Fixing bug 1211