fixing bug #4985
fixing bug #4986