Fixes #107 for real this time.