Edit custom fields fix