Fixes #57 some more