Fixing bug 3223