Fixing issue #266
more fixes for issue #266
more fixes for issue #266
Merge pull request #267 from meganap/agut_issue_266

Agut issue #266