Fixing issue #227
Merge pull request #228 from meganap/agut_issue_227

Fixing issue #227