Fixed round-trip errors