- zapt->attributeList[i]->attributeType = &attr_list[2*i];
- zapt->attributeList[i]->attributeValue = &attr_list[2*i+1];
+ zapt->attributeList[i]->attributeType = &attr_tmp[2*i];
+#ifdef Z_95
+ zapt->attributeList[i]->which = Z_AttributeValue_numeric;
+ zapt->attributeList[i]->value = &attr_tmp[2*i+1];
+#else
+ zapt->attributeList[i]->attributeValue = &attr_tmp[2*i+1];
+#endif