Fixing bug #10173