Fixing roundtrip problems, for realz