diff --git a/src/ivfbuild.c b/src/ivfbuild.c
index 533eeb4..b6991ab 100644
--- a/src/ivfbuild.c
+++ b/src/ivfbuild.c
@@ -339,6 +339,8 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum)
 		/* Set the start and insert pages */
 		IvfflatUpdateList(index, buildstate->listInfo[i], insertPage, InvalidBlockNumber, startPage, forkNum);
 	}
+
+	pfree(tupdesc);
 }
 
 /*
diff --git a/src/ivfutils.c b/src/ivfutils.c
index 9e02406..fb649bf 100644
--- a/src/ivfutils.c
+++ b/src/ivfutils.c
@@ -249,7 +249,7 @@ IvfflatUpdateList(Relation index, ListInfo listInfo,
 TupleDesc
 IvfflatTupleDesc(Relation index)
 {
-	TupleDesc	tupdesc = RelationGetDescr(index);
+	TupleDesc	tupdesc = CreateTupleDescCopyConstr(RelationGetDescr(index));
 
 	/* Prevent compression */
 	TupleDescAttr(tupdesc, 0)->attstorage = TYPSTORAGE_PLAIN;