Fixing issue #255
Merge pull request #265 from meganap/agut_issue_255

Fixing issue #255