Fixing bug 1225