fixing bug #6072