Fixes #34

Actually it is a bit of a workaround