Hopefully fixes #61