Fix For Bug#4279

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
Merge pull request #923 from dhananjay92/Bug#4279

Fix For Bug#4279