diff --git a/src/queueElemDelete.c b/src/queueElemDelete.c
index 9fb4a9c..d4fc4f2 100644
--- a/src/queueElemDelete.c
+++ b/src/queueElemDelete.c
@@ -10,12 +10,14 @@ int msgQueueElemDelete(msgQueueElemId queueElemId){
 	goto ERROR;
   }
 
+	strcpy(nextIdToDie, queueElemAddr->next);
+	
   if (msgQueueElemClose(queueElemAddr) < 0){
   	NZG_ERROR("msgQueueElemClose",queueElemId);
 	goto ERROR;
   }
 
-  if (nextIdToDie != NULL){
+  if (nextIdToDie != queueElemId){
 	return msgQueueElemDelete(nextIdToDie);
   } else {
 	return 0;