diff --git a/compute/pzlascal.c b/compute/pzlascal.c
index 5334730b3cae41d140c6f452fefe2e1986bb3d01..40666a94b42efebbe1f11631ab90611a1020a095 100644
--- a/compute/pzlascal.c
+++ b/compute/pzlascal.c
@@ -53,7 +53,7 @@ void chameleon_pzlascal(cham_uplo_t uplo, CHAMELEON_Complex64_t alpha, CHAM_desc
                 alpha, A(n, n));
 
             for (m = n+1; m < A->mt; m++) {
-                tempmm = m == A->mt-1 ? A->m-A->mb*m : A->nb;
+                tempmm = m == A->mt-1 ? A->m - m * A->mb : A->mb;
 
                 INSERT_TASK_zlascal(
                     &options,
@@ -65,7 +65,7 @@ void chameleon_pzlascal(cham_uplo_t uplo, CHAMELEON_Complex64_t alpha, CHAM_desc
 
     case ChamUpper:
         for (m = 0; m < minmnt; m++) {
-            tempmm = m == A->mt-1 ? A->m-A->mb*m : A->nb;
+            tempmm = m == A->mt-1 ? A->m - m * A->mb : A->mb;
             tempmn = m == A->nt-1 ? A->n-m*A->nb : A->nb;
 
             INSERT_TASK_zlascal(
@@ -87,7 +87,7 @@ void chameleon_pzlascal(cham_uplo_t uplo, CHAMELEON_Complex64_t alpha, CHAM_desc
     case ChamUpperLower:
     default:
         for (m = 0; m < A->mt; m++) {
-            tempmm = m == A->mt-1 ? A->m-A->mb*m : A->nb;
+            tempmm = m == A->mt-1 ? A->m - m * A->mb : A->mb;
 
             for (n = 0; n < A->nt; n++) {
                 tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
diff --git a/compute/pztradd.c b/compute/pztradd.c
index 78d7a3d282e8a4d08bd57b91ffe2935fe337210e..089028acbb6b97164e8dc31b431aa10089c73cb7 100644
--- a/compute/pztradd.c
+++ b/compute/pztradd.c
@@ -63,7 +63,7 @@ void chameleon_pztradd( cham_uplo_t uplo, cham_trans_t trans,
                     beta,  B(n, n));
 
                 for (m = n+1; m < B->mt; m++) {
-                    tempmm = m == B->mt-1 ? B->m-B->mb*m : B->nb;
+                    tempmm = m == B->mt-1 ? B->m -m * B->mb : B->mb;
 
                     INSERT_TASK_zgeadd(
                         &options,
@@ -85,7 +85,7 @@ void chameleon_pztradd( cham_uplo_t uplo, cham_trans_t trans,
                     beta,  B(n, n));
 
                 for (m = n+1; m < B->mt; m++) {
-                    tempmm = m == B->mt-1 ? B->m-B->mb*m : B->nb;
+                    tempmm = m == B->mt-1 ? B->m - m * B->mb : B->mb;
 
                     INSERT_TASK_zgeadd(
                         &options,
@@ -99,7 +99,7 @@ void chameleon_pztradd( cham_uplo_t uplo, cham_trans_t trans,
     case ChamUpper:
         if (trans == ChamNoTrans) {
             for (m = 0; m < minmn; m++) {
-                tempmm = m == B->mt-1 ? B->m - m * B->mb : B->nb;
+                tempmm = m == B->mt-1 ? B->m - m * B->mb : B->mb;
                 tempmn = m == B->nt-1 ? B->n - m * B->nb : B->nb;
 
                 INSERT_TASK_ztradd(
@@ -121,7 +121,7 @@ void chameleon_pztradd( cham_uplo_t uplo, cham_trans_t trans,
         }
         else {
             for (m = 0; m < chameleon_min(B->mt,B->nt); m++) {
-                tempmm = m == B->mt-1 ? B->m-B->mb*m : B->nb;
+                tempmm = m == B->mt-1 ? B->m - m * B->mb : B->mb;
                 tempmn = m == B->nt-1 ? B->n-m*B->nb : B->nb;
 
                 INSERT_TASK_ztradd(
@@ -146,7 +146,7 @@ void chameleon_pztradd( cham_uplo_t uplo, cham_trans_t trans,
     default:
         if (trans == ChamNoTrans) {
             for (m = 0; m < B->mt; m++) {
-                tempmm = m == B->mt-1 ? B->m-B->mb*m : B->nb;
+                tempmm = m == B->mt-1 ? B->m - m * B->mb : B->mb;
 
                 for (n = 0; n < B->nt; n++) {
                     tempnn = n == B->nt-1 ? B->n-n*B->nb : B->nb;
@@ -161,7 +161,7 @@ void chameleon_pztradd( cham_uplo_t uplo, cham_trans_t trans,
         }
         else {
             for (m = 0; m < B->mt; m++) {
-                tempmm = m == B->mt-1 ? B->m-B->mb*m : B->nb;
+                tempmm = m == B->mt-1 ? B->m - m * B->mb : B->mb;
 
                 for (n = 0; n < B->nt; n++) {
                     tempnn = n == B->nt-1 ? B->n-n*B->nb : B->nb;