Probably fixes #26 for real this time