diff --git a/compute/zgeadd.c b/compute/zgeadd.c
index 98ddf3b1c8c4cb76c11a111769ddfb4c5089a5d9..8a93c40fe0d2dc8db7e912575506cfe6b32dd14f 100644
--- a/compute/zgeadd.c
+++ b/compute/zgeadd.c
@@ -111,7 +111,7 @@ int MORSE_zgeadd( MORSE_enum trans, int M, int N,
     }
 
     /* Check input arguments */
-    if ((trans >= MorseNoTrans) && (trans <= MorseConjTrans)) {
+    if (((trans < MorseNoTrans) || (trans > MorseConjTrans))) {
         morse_error("MORSE_zgeadd", "illegal value of trans");
         return -1;
     }
@@ -324,7 +324,7 @@ int MORSE_zgeadd_Tile_Async( MORSE_enum trans,
         return morse_request_fail(sequence, request, MORSE_ERR_ILLEGAL_VALUE);
     }
     /* Check input arguments */
-    if ((trans >= MorseNoTrans) && (trans <= MorseConjTrans)) {
+    if (((trans < MorseNoTrans) || (trans > MorseConjTrans))) {
         morse_error("MORSE_zgeadd_Tile_Async", "illegal value of trans");
         return morse_request_fail(sequence, request, -1);
     }
diff --git a/compute/zgemm.c b/compute/zgemm.c
index 8a5028c0e3861037f853a44c0138258d472d7679..bf527b5ed28ba71a29cb62b1295b23d1f3e07ee0 100644
--- a/compute/zgemm.c
+++ b/compute/zgemm.c
@@ -152,11 +152,11 @@ int MORSE_zgemm( MORSE_enum transA, MORSE_enum transB, int M, int N, int K,
     }
 
     /* Check input arguments */
-    if ((transA >= MorseNoTrans) && (transA <= MorseConjTrans)) {
+    if (((transA < MorseNoTrans) || (transA > MorseConjTrans))) {
         morse_error("MORSE_zgemm", "illegal value of transA");
         return -1;
     }
-    if ((transB >= MorseNoTrans) && (transB <= MorseConjTrans)) {
+    if (((transB < MorseNoTrans) || (transB > MorseConjTrans))) {
         morse_error("MORSE_zgemm", "illegal value of transB");
         return -2;
     }
@@ -401,11 +401,11 @@ int MORSE_zgemm_Tile_Async( MORSE_enum transA, MORSE_enum transB,
         return morse_request_fail(sequence, request, MORSE_ERR_ILLEGAL_VALUE);
     }
     /* Check input arguments */
-    if ((transA >= MorseNoTrans) && (transA <= MorseConjTrans)) {
+    if (((transA < MorseNoTrans) || (transA > MorseConjTrans))) {
         morse_error("MORSE_zgemm_Tile_Async", "illegal value of transA");
         return morse_request_fail(sequence, request, -1);
     }
-    if ((transB >= MorseNoTrans) && (transB <= MorseConjTrans)) {
+    if (((transB < MorseNoTrans) || (transB > MorseConjTrans))) {
         morse_error("MORSE_zgemm_Tile_Async", "illegal value of transB");
         return morse_request_fail(sequence, request, -2);
     }
diff --git a/compute/ztradd.c b/compute/ztradd.c
index 7727842ca0cc88aaa4f432c7a69edb60eb5985e5..02f1a7d6ed7e79533f7f881d1fe2b1525ed83b99 100644
--- a/compute/ztradd.c
+++ b/compute/ztradd.c
@@ -121,7 +121,7 @@ int MORSE_ztradd( MORSE_enum uplo, MORSE_enum trans, int M, int N,
         morse_error("MORSE_ztradd", "illegal value of uplo");
         return -1;
     }
-    if ((trans >= MorseNoTrans) && (trans <= MorseConjTrans)) {
+    if (((trans < MorseNoTrans) || (trans > MorseConjTrans))) {
         morse_error("MORSE_ztradd", "illegal value of trans");
         return -2;
     }
@@ -340,7 +340,7 @@ int MORSE_ztradd_Tile_Async( MORSE_enum uplo, MORSE_enum trans,
         return morse_request_fail(sequence, request, MORSE_ERR_ILLEGAL_VALUE);
     }
     /* Check input arguments */
-    if ((trans >= MorseNoTrans) && (trans <= MorseConjTrans)) {
+    if (((trans < MorseNoTrans) || (trans > MorseConjTrans))) {
         morse_error("MORSE_ztradd_Tile_Async", "illegal value of trans");
         return morse_request_fail(sequence, request, -1);
     }
diff --git a/compute/ztrmm.c b/compute/ztrmm.c
index 1cb08351d3cec4e94f3c3be75538a1498c24b696..2c7e51ddfb64896adb34a8c98cde5ef23146f481 100644
--- a/compute/ztrmm.c
+++ b/compute/ztrmm.c
@@ -371,7 +371,7 @@ int MORSE_ztrmm_Tile_Async( MORSE_enum side, MORSE_enum uplo,
         morse_error("MORSE_ztrmm_Tile", "illegal value of uplo");
         return morse_request_fail(sequence, request, -2);
     }
-    if ((transA >= MorseNoTrans) && (transA <= MorseConjTrans)) {
+    if (((transA < MorseNoTrans) || (transA > MorseConjTrans))) {
         morse_error("MORSE_ztrmm_Tile", "illegal value of transA");
         return morse_request_fail(sequence, request, -3);
     }
diff --git a/compute/ztrsm.c b/compute/ztrsm.c
index 35c41dcacb3f4cfb7e497b58ed8a893b7c114d43..dfa1fb5655137016f47100660ec05bec461f13d8 100644
--- a/compute/ztrsm.c
+++ b/compute/ztrsm.c
@@ -136,7 +136,7 @@ int MORSE_ztrsm( MORSE_enum side, MORSE_enum uplo,
         morse_error("MORSE_ztrsm", "illegal value of uplo");
         return -2;
     }
-    if ((transA >= MorseNoTrans) && (transA <= MorseConjTrans) ) {
+    if (((transA < MorseNoTrans) || (transA > MorseConjTrans)) ) {
         morse_error("MORSE_ztrsm", "illegal value of transA");
         return -3;
     }
@@ -369,7 +369,7 @@ int MORSE_ztrsm_Tile_Async( MORSE_enum side, MORSE_enum uplo,
         morse_error("MORSE_ztrsm_Tile", "illegal value of uplo");
         return morse_request_fail(sequence, request, -2);
     }
-    if ((transA >= MorseNoTrans) && (transA <= MorseConjTrans)) {
+    if (((transA < MorseNoTrans) || (transA > MorseConjTrans))) {
         morse_error("MORSE_ztrsm_Tile", "illegal value of transA");
         return morse_request_fail(sequence, request, -3);
     }