Bug fix: roundtrip messages