fixes roundtrip