Probably fixes #37