diff --git a/nlsr_adl.c b/nlsr_adl.c
index 96409bc..63d9a63 100644
--- a/nlsr_adl.c
+++ b/nlsr_adl.c
@@ -42,14 +42,11 @@
 	hnbr->neighbor=(struct name_prefix *)malloc(sizeof(struct name_prefix *));
 	hnbr->neighbor->name=(char *)malloc(nbr->neighbor->length);
 	memcpy(hnbr->neighbor->name,nbr->neighbor->name,nbr->neighbor->length);
-	//hnbr->last_lsdb_version=(char *)malloc(15);
 
 	hnbr->neighbor->length=nbr->neighbor->length;
 	hnbr->face=nbr->face;
 	hnbr->status=nbr->status;
 	hnbr->last_lsdb_version=0;
-	//memcpy(hnbr->last_lsdb_version,"00000000000000",14);
-	//memcpy(hnbr->last_lsdb_version+strlen(hnbr->last_lsdb_version),"\0",1);
 
 	struct hashtb_param param_luq = {0};
 	hnbr->lsa_update_queue=hashtb_create(200, &param_luq);
diff --git a/nlsr_ndn.c b/nlsr_ndn.c
index 6d6a56c..c04decf 100644
--- a/nlsr_ndn.c
+++ b/nlsr_ndn.c
@@ -432,9 +432,12 @@
 	for(i=0;i<adl_element;i++)
 	{
 		nbr=e->data;
-		printf("Sending interest for name prefix:%s/%s/%s\n",nbr->neighbor->name,nlsr_str,lsdb_str);	
+
+		char *prefix=(char *)malloc(nbr->neighbor->length);
+		memcpy(prefix,nbr->neighbor->name,nbr->neighbor->length);		
+		printf("Sending interest for name prefix:%s/%s/%s\n",prefix,nlsr_str,lsdb_str);	
 		name=ccn_charbuf_create();
-		res=ccn_name_from_uri(name,nbr->neighbor->name);
+		res=ccn_name_from_uri(name,prefix);
 		ccn_name_append_str(name,nlsr_str);
 		ccn_name_append_str(name,lsdb_str);
 		//ccn_name_append_str(name,rnumstr);
@@ -471,8 +474,10 @@
 		ccn_charbuf_destroy(&c);
 		ccn_charbuf_destroy(&templ);
 		ccn_charbuf_destroy(&name);
+		free(prefix);
 	
-		hashtb_next(e);		
+		hashtb_next(e);	
+	
 	}
 
 	hashtb_end(e);