fix handling of unmarshallers