fixing bug #4448
fixing bug #4417
fixing bug #4442