Fixes #167 and adds temporary test
Merge pull request #168 from dcousens/167fix

Fixes #167