fix for custom_fields