diff --git a/src/chameleon.c b/src/chameleon.c
index 98c91fe9d8a5ee451358c0b66f8b57510862793b..543f8792d6cb4afefb480cbad33b32f1dc108317 100644
--- a/src/chameleon.c
+++ b/src/chameleon.c
@@ -133,7 +133,7 @@ CHAM_desc_t     **descA )
   CHKERRQ(ierr);
 
   // Assembly driven by chameleon and using the callback CHAMELEON_build_callback_FEMBEM() defined above
-  ierr = CHAMELEON_map_Tile( uplo, *descA,
+  ierr = CHAMELEON_map_Tile( ChamW, uplo, *descA,
                              CHAMELEON_build_callback_FEMBEM, myCtx );
   CHKERRQ(ierr);
 
diff --git a/src/hchameleon.c b/src/hchameleon.c
index fad9c0f5367f427462def1ec0099f82dae7601ea..f812833d82e0e7277fedda80cf4cae5d2b1215c1 100644
--- a/src/hchameleon.c
+++ b/src/hchameleon.c
@@ -191,7 +191,7 @@ hmat_interface_t *hi )
      */
 #if 1
   cham_uplo_t uplo = symMatSolver ? ChamLower : ChamUpperLower;
-  ierr = CHAMELEON_map_Tile( uplo, descA,
+  ierr = CHAMELEON_map_Tile( ChamW, uplo, descA,
                              HCHAMELEON_build_callback_FEMBEM, hdescA );
 #else
   tile = descA->tiles;
@@ -403,7 +403,7 @@ hmat_info_t HCHAMELEON_getinfo( HCHAM_desc_t *hdesc )
   };
   cham_uplo_t uplo = symMatSolver ? ChamLower : ChamUpperLower;
 
-  CHAMELEON_map_Tile( uplo, hdesc->super,
+  CHAMELEON_map_Tile( ChamR, uplo, hdesc->super,
                       HCHAMELEON_map_getinfo, &op_args );
 
   MPI_Allreduce( &(op_args.compress_size), &ginfo.compressed_size, 1,