Changes to fix issue #243
Merge pull request #244 from bijugs/fix_issue_243

Changes to fix issue #243