r18846: Fix the same bug Volker noticed when marshalling/unmarshalling