FieldsPartitioner fix