Fixes custom field assignment