Fixing issue #231
Merge pull request #232 from meganap/agut_issue_231

Fixing issue #231