Fix for issue #296
Merge pull request #297 from bijugs/fix_issue_296

Fix for issue #296