Fix nested_fields removing