diff --git a/compute/pzhemm.c b/compute/pzhemm.c
index b47dda5baa2ac08d4904d564a73a98b4cecdf515..12269d34a3abf4de45163eb75657441cceac5e74 100644
--- a/compute/pzhemm.c
+++ b/compute/pzhemm.c
@@ -339,7 +339,7 @@ chameleon_pzhemm_summa_left( CHAM_context_t *chamctxt, cham_uplo_t uplo,
                 options,
                 ChamUpperLower, tempam, tempak,
                 A( Am, Ak ),
-                WA( m, (k % C->q) + lq ) );
+                WA( m, (Ak % C->q) + lq ) );
 
             RUNTIME_data_flush( sequence, A( Am, Ak ) );
 
@@ -347,8 +347,8 @@ chameleon_pzhemm_summa_left( CHAM_context_t *chamctxt, cham_uplo_t uplo,
                 INSERT_TASK_zlacpy(
                     options,
                     ChamUpperLower, tempam, tempak,
-                    WA( m, ((k+q-1) % C->q) + lq ),
-                    WA( m, ((k+q)   % C->q) + lq ) );
+                    WA( m, ((Ak+q-1) % C->q) + lq ),
+                    WA( m, ((Ak+q)   % C->q) + lq ) );
             }
         }
 
@@ -496,7 +496,7 @@ chameleon_pzhemm_summa_right( CHAM_context_t *chamctxt, cham_uplo_t uplo,
                 options,
                 ChamUpperLower, tempak, tempan,
                 A(  Ak,              An ),
-                WB( (k % C->p) + lp, n  ) );
+                WB( (Ak % C->p) + lp, n  ) );
 
             RUNTIME_data_flush( sequence, A( Ak, An ) );
 
@@ -504,8 +504,8 @@ chameleon_pzhemm_summa_right( CHAM_context_t *chamctxt, cham_uplo_t uplo,
                 INSERT_TASK_zlacpy(
                     options,
                     ChamUpperLower, tempak, tempan,
-                    WB( ((k+p-1) % C->p) + lp, n ),
-                    WB( ((k+p)   % C->p) + lp, n ) );
+                    WB( ((Ak+p-1) % C->p) + lp, n ),
+                    WB( ((Ak+p)   % C->p) + lp, n ) );
             }
         }
 
diff --git a/compute/pzsymm.c b/compute/pzsymm.c
index 47632f6ce07bd4a0254cff94ad7b1a258f3d14e4..944ac75ea2daef41f206207d420e9d0543fd0ae1 100644
--- a/compute/pzsymm.c
+++ b/compute/pzsymm.c
@@ -340,7 +340,7 @@ chameleon_pzsymm_summa_left( CHAM_context_t *chamctxt, cham_uplo_t uplo,
                 options,
                 ChamUpperLower, tempam, tempak,
                 A( Am, Ak ),
-                WA( m, (k % C->q) + lq ) );
+                WA( m, (Ak % C->q) + lq ) );
 
             RUNTIME_data_flush( sequence, A( Am, Ak ) );
 
@@ -348,8 +348,8 @@ chameleon_pzsymm_summa_left( CHAM_context_t *chamctxt, cham_uplo_t uplo,
                 INSERT_TASK_zlacpy(
                     options,
                     ChamUpperLower, tempam, tempak,
-                    WA( m, ((k+q-1) % C->q) + lq ),
-                    WA( m, ((k+q)   % C->q) + lq ) );
+                    WA( m, ((Ak+q-1) % C->q) + lq ),
+                    WA( m, ((Ak+q)   % C->q) + lq ) );
             }
         }
 
@@ -497,7 +497,7 @@ chameleon_pzsymm_summa_right( CHAM_context_t *chamctxt, cham_uplo_t uplo,
                 options,
                 ChamUpperLower, tempak, tempan,
                 A(  Ak,              An ),
-                WB( (k % C->p) + lp, n  ) );
+                WB( (Ak % C->p) + lp, n  ) );
 
             RUNTIME_data_flush( sequence, A( Ak, An ) );
 
@@ -505,8 +505,8 @@ chameleon_pzsymm_summa_right( CHAM_context_t *chamctxt, cham_uplo_t uplo,
                 INSERT_TASK_zlacpy(
                     options,
                     ChamUpperLower, tempak, tempan,
-                    WB( ((k+p-1) % C->p) + lp, n ),
-                    WB( ((k+p)   % C->p) + lp, n ) );
+                    WB( ((Ak+p-1) % C->p) + lp, n ),
+                    WB( ((Ak+p)   % C->p) + lp, n ) );
             }
         }