Fix for Bug#4275

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

Fix for Bug#4275