Fixed an issue with custom fields.