Quick hack to work around issue #175

Fixes #175