diff --git a/crypto_kem/hqc-rmrs-128/avx2/reed_solomon.c b/crypto_kem/hqc-rmrs-128/avx2/reed_solomon.c
index c5cd8a7c..a45b40c6 100644
--- a/crypto_kem/hqc-rmrs-128/avx2/reed_solomon.c
+++ b/crypto_kem/hqc-rmrs-128/avx2/reed_solomon.c
@@ -44,7 +44,7 @@ void PQCLEAN_HQCRMRS128_AVX2_reed_solomon_encode(uint8_t *cdw, const uint8_t *ms
     }
 
     for (i = 0; i < PARAM_K; ++i) {
-        gate_value = msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1];
+        gate_value = (uint8_t) (msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1]);
 
         for (j = 0; j < PARAM_G; ++j) {
             tmp[j] = PQCLEAN_HQCRMRS128_AVX2_gf_mul(gate_value, PARAM_RS_POLY[j]);
diff --git a/crypto_kem/hqc-rmrs-128/clean/reed_solomon.c b/crypto_kem/hqc-rmrs-128/clean/reed_solomon.c
index d3adc92e..0640fbf1 100644
--- a/crypto_kem/hqc-rmrs-128/clean/reed_solomon.c
+++ b/crypto_kem/hqc-rmrs-128/clean/reed_solomon.c
@@ -44,7 +44,7 @@ void PQCLEAN_HQCRMRS128_CLEAN_reed_solomon_encode(uint8_t *cdw, const uint8_t *m
     }
 
     for (i = 0; i < PARAM_K; ++i) {
-        gate_value = msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1];
+        gate_value = (uint8_t) (msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1]);
 
         for (j = 0; j < PARAM_G; ++j) {
             tmp[j] = PQCLEAN_HQCRMRS128_CLEAN_gf_mul(gate_value, PARAM_RS_POLY[j]);
diff --git a/crypto_kem/hqc-rmrs-192/avx2/reed_solomon.c b/crypto_kem/hqc-rmrs-192/avx2/reed_solomon.c
index d0c7d20e..b50e91d1 100644
--- a/crypto_kem/hqc-rmrs-192/avx2/reed_solomon.c
+++ b/crypto_kem/hqc-rmrs-192/avx2/reed_solomon.c
@@ -44,7 +44,7 @@ void PQCLEAN_HQCRMRS192_AVX2_reed_solomon_encode(uint8_t *cdw, const uint8_t *ms
     }
 
     for (i = 0; i < PARAM_K; ++i) {
-        gate_value = msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1];
+        gate_value = (uint8_t) (msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1]);
 
         for (j = 0; j < PARAM_G; ++j) {
             tmp[j] = PQCLEAN_HQCRMRS192_AVX2_gf_mul(gate_value, PARAM_RS_POLY[j]);
diff --git a/crypto_kem/hqc-rmrs-192/clean/reed_solomon.c b/crypto_kem/hqc-rmrs-192/clean/reed_solomon.c
index 5e0c215f..1ee9ec2e 100644
--- a/crypto_kem/hqc-rmrs-192/clean/reed_solomon.c
+++ b/crypto_kem/hqc-rmrs-192/clean/reed_solomon.c
@@ -44,7 +44,7 @@ void PQCLEAN_HQCRMRS192_CLEAN_reed_solomon_encode(uint8_t *cdw, const uint8_t *m
     }
 
     for (i = 0; i < PARAM_K; ++i) {
-        gate_value = msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1];
+        gate_value = (uint8_t) (msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1]);
 
         for (j = 0; j < PARAM_G; ++j) {
             tmp[j] = PQCLEAN_HQCRMRS192_CLEAN_gf_mul(gate_value, PARAM_RS_POLY[j]);
diff --git a/crypto_kem/hqc-rmrs-256/avx2/reed_solomon.c b/crypto_kem/hqc-rmrs-256/avx2/reed_solomon.c
index ef25404e..99ee5a41 100644
--- a/crypto_kem/hqc-rmrs-256/avx2/reed_solomon.c
+++ b/crypto_kem/hqc-rmrs-256/avx2/reed_solomon.c
@@ -44,7 +44,7 @@ void PQCLEAN_HQCRMRS256_AVX2_reed_solomon_encode(uint8_t *cdw, const uint8_t *ms
     }
 
     for (i = 0; i < PARAM_K; ++i) {
-        gate_value = msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1];
+        gate_value = (uint8_t) (msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1]);
 
         for (j = 0; j < PARAM_G; ++j) {
             tmp[j] = PQCLEAN_HQCRMRS256_AVX2_gf_mul(gate_value, PARAM_RS_POLY[j]);
diff --git a/crypto_kem/hqc-rmrs-256/clean/reed_solomon.c b/crypto_kem/hqc-rmrs-256/clean/reed_solomon.c
index d1b1f497..d6a1f62c 100644
--- a/crypto_kem/hqc-rmrs-256/clean/reed_solomon.c
+++ b/crypto_kem/hqc-rmrs-256/clean/reed_solomon.c
@@ -44,7 +44,7 @@ void PQCLEAN_HQCRMRS256_CLEAN_reed_solomon_encode(uint8_t *cdw, const uint8_t *m
     }
 
     for (i = 0; i < PARAM_K; ++i) {
-        gate_value = msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1];
+        gate_value = (uint8_t) (msg[PARAM_K - 1 - i] ^ cdw[PARAM_N1 - PARAM_K - 1]);
 
         for (j = 0; j < PARAM_G; ++j) {
             tmp[j] = PQCLEAN_HQCRMRS256_CLEAN_gf_mul(gate_value, PARAM_RS_POLY[j]);