fixing bug #4220
fixing bug #4219