Bugfix #132

Fixes #132