Fixed import of custom fields