fixing bug #4507