Bugfix

Closes GH-189