custom fields fix