Added a fix for supporting custom fields.