initial wip fix for issue #34
Merge pull request #41 from wri/feature/fix-34

WIP: Fix for issue #34