fixing issue #210
updating fix for issue #201
Merge pull request #217 from meganap/agut_issue_201

fixing issue #201