Fix failing rountrip test