fixing bug #4219
fixing bug #4220