Minor fix in the marshaller