Fix for issue 274
Merge pull request #275 from bijugs/fix_issue_274

Fix for issue 274