Merge pull request #4 from dhananjay92/bug#4237

Fix for bug#4237.