diff --git a/runtime/parsec/codelets/codelet_map.c b/runtime/parsec/codelets/codelet_map.c
index 8c62ab82a963db94e9bd00b2c60195595e27f530..681d2588b253dc6b50afb66ed22637ca322f853c 100644
--- a/runtime/parsec/codelets/codelet_map.c
+++ b/runtime/parsec/codelets/codelet_map.c
@@ -46,8 +46,8 @@ void INSERT_TASK_map( const RUNTIME_option_t *options,
         PARSEC_dtd_taskpool, CORE_map_parsec, options->priority, "map",
         sizeof(CHAM_desc_t*),             &A,    VALUE,
         sizeof(cham_uplo_t),              &uplo, VALUE,
-        sizeof(int),                      &m,    VALUE,
-        sizeof(int),                      &n,    VALUE,
+        sizeof(int),                      &Am,   VALUE,
+        sizeof(int),                      &An,   VALUE,
         PASSED_BY_REF, RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An), chameleon_parsec_get_arena_index( A ) | INOUT,
         sizeof(cham_unary_operator_t),    &operator, VALUE,
         sizeof(void*),                    &op_args,  VALUE,
diff --git a/runtime/quark/codelets/codelet_map.c b/runtime/quark/codelets/codelet_map.c
index 3506746d3788fedea3398ff2dd2dbc7d38a1fd2d..cbfc6b12ff2daf8e11a9d3dea4988325b0b17596 100644
--- a/runtime/quark/codelets/codelet_map.c
+++ b/runtime/quark/codelets/codelet_map.c
@@ -40,8 +40,8 @@ void INSERT_TASK_map( const RUNTIME_option_t *options,
     QUARK_Insert_Task(opt->quark, CORE_map_quark, (Quark_Task_Flags*)opt,
         sizeof(CHAM_desc_t*),             &A,    VALUE,
         sizeof(cham_uplo_t),              &uplo, VALUE,
-        sizeof(int),                      &m,    VALUE,
-        sizeof(int),                      &n,    VALUE,
+        sizeof(int),                      &Am    VALUE,
+        sizeof(int),                      &An    VALUE,
         sizeof(CHAMELEON_Complex64_t), RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An), INOUT,
         sizeof(cham_unary_operator_t),    &operator, VALUE,
         sizeof(void*),                    &op_args,  VALUE,