fix return and config issue
Demo round-trippability