Fix marshaling bug for a corner case