fix bug #4540 #4541

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
Merge pull request #1362 from smita786/master

fix bug #4540 #4541