*8445* Improve round-tripping