I think #44 is finally properly fixed, for real this time!