Fixes #72 for good this time