Fixes #5, hopefully for real this time.