Bugfix

Closes GH-158