diff --git a/applications/jpip/Makefile.nix b/applications/jpip/Makefile.nix
index 29b3ce76..faa991ba 100644
--- a/applications/jpip/Makefile.nix
+++ b/applications/jpip/Makefile.nix
@@ -1,19 +1,19 @@
 default: t_libopenjpip t_opj_server t_opj_dec_server t_tools
 
 t_libopenjpip:
-	make -C libopenjpip
+	make -C libopenjpip -f Makefile.nix
 
 t_opj_server:
-	make -C opj_server
+	make -C opj_server -f Makefile.nix
 
 t_opj_dec_server:
-	make -C opj_client/opj_dec_server
+	make -C opj_client/opj_dec_server  -f Makefile.nix
 
 t_tools:
-	make -C tools
+	make -C tools  -f Makefile.nix
 
 clean:
-	make clean -C libopenjpip
-	make clean -C opj_server
-	make clean -C opj_client/opj_dec_server
-	make clean -C tools
+	make clean -C libopenjpip -f Makefile.nix
+	make clean -C opj_server  -f Makefile.nix
+	make clean -C opj_client/opj_dec_server -f Makefile.nix
+	make clean -C tools -f Makefile.nix
diff --git a/applications/jpip/libopenjpip/msgqueue_manager.c b/applications/jpip/libopenjpip/msgqueue_manager.c
index 5e9fc103..1e11041e 100644
--- a/applications/jpip/libopenjpip/msgqueue_manager.c
+++ b/applications/jpip/libopenjpip/msgqueue_manager.c
@@ -744,7 +744,7 @@ Byte_t * recons_codestream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte
   // main header first
   ptr = msgqueue->first;
   while(( ptr = search_message( MAINHEADER_MSG, -1, csn, ptr))!=NULL){
-    codestream = add_msgstream( ptr, stream, codestream, codelen);
+    codestream = add_msgstream( ptr, jpipstream, codestream, codelen);
     ptr = ptr->next;
   }
 
@@ -755,14 +755,14 @@ Byte_t * recons_codestream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte
     ptr = msgqueue->first;
     while(( ptr = search_message( TILE_MSG, tileID, csn, ptr))!=NULL){
       found = true;
-      codestream = add_msgstream( ptr, stream, codestream, codelen);
+      codestream = add_msgstream( ptr, jpipstream, codestream, codelen);
       ptr = ptr->next;
     }
     ptr = msgqueue->first;
     while(( ptr = search_message( EXT_TILE_MSG, tileID, csn, ptr))!=NULL){
       if( ptr->aux >= minlev){
 	found = true;
-	codestream = add_msgstream( ptr, stream, codestream, codelen);
+	codestream = add_msgstream( ptr, jpipstream, codestream, codelen);
       }
       ptr = ptr->next;
     }
diff --git a/applications/jpip/tools/Makefile.nix b/applications/jpip/tools/Makefile.nix
index d522b473..474854df 100644
--- a/applications/jpip/tools/Makefile.nix
+++ b/applications/jpip/tools/Makefile.nix
@@ -8,7 +8,7 @@ ALL = jpip_to_jp2 jpip_to_j2k test_index addXMLinJP2
 all: t_indexer $(ALL)
   
 t_indexer:
-	make -C indexer
+	make -C indexer -f Makefile.nix
 
 jpip_to_jp2: jpip_to_jp2.o $(LIBFNAME)
 	    $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
@@ -21,4 +21,4 @@ test_index: test_index.o $(LIBFNAME)
 
 clean:
 	rm -f $(ALL) *.o *~
-	make clean -C indexer
+	make clean -C indexer -f Makefile.nix