Fixing bug #10283