fix bug #4540 #4541

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>