Fixes #34

...but is a hack