diff --git a/src/headerlist.c b/src/headerlist.c
index 09d566b..de79e13 100644
--- a/src/headerlist.c
+++ b/src/headerlist.c
@@ -890,11 +890,11 @@ void getXMLPackageNFV(xmlNode *parent, char ***name,
             return;
          }
          n = (char*)findXMLAttributeByName(entry, "name");
+         buf[0] = '\0';
          if (n[0] != '(') {
              (*name)[i] = n;
              (*flags)[i] = XMLFlagToInt(
                 (char*)findXMLAttributeByName(entry, "flags"));
-             buf[0] = '\0';
              if ((*flags)[i] != RPMSENSE_ANY) {
                char *epoch = (char*)findXMLAttributeByName(entry, "epoch");
                char *ver = (char*)findXMLAttributeByName(entry, "ver");
@@ -944,7 +944,7 @@ void getXMLPackageNFV(xmlNode *parent, char ***name,
                  logmsg(LOG_WARNING,"getXMLPackageNFV: don't know how to process '%s'; ignoring", n);
                  (*name)[i] = n;
                  (*flags)[i] = RPMSENSE_ANY;
-                 (*version)[i] = NULL;
+                 (*version)[i] = strdup(buf);
              }
          }
          i++;