Fixing issue #236
Merge pull request #239 from meganap/agut_issue_236

Fixing issue #236