fixes
custom fields fix