Fix custom_fields