fix for custom fields