Hopefully fixes #17