added fill_roundtrip back