Actually 100% totally fixed #89 for real this time