diff --git a/lib/legacy.c b/lib/legacy.c
index 8ba7bbd559..4f86e137e0 100644
--- a/lib/legacy.c
+++ b/lib/legacy.c
@@ -244,12 +244,12 @@ int headerConvert(Header h, int op)
 #define TDWRAP() \
     if (type) \
 	*type = td.type; \
+    if (c) \
+	*c = td.count; \
     if (p) \
 	*p = td.data; \
     else \
-	rpmtdFreeData(&td); \
-    if (c) \
-	*c = td.count
+	rpmtdFreeData(&td)
 
 int headerRemoveEntry(Header h, rpm_tag_t tag)
 {