diff --git a/src/cache_digest.cc b/src/cache_digest.cc
index 750d17eb..5ca763ee 100644
--- a/src/cache_digest.cc
+++ b/src/cache_digest.cc
@@ -76,8 +76,9 @@ int compute_hash_values(std::vector<uint64_t> &hash_values,
         (static_cast<uint64_t>(md[25]) << 48) +
         (static_cast<uint64_t>(md[26]) << 40) +
         (static_cast<uint64_t>(md[27]) << 32) +
-        (static_cast<uint64_t>(md[28]) << 24) + (md[29] << 16) + (md[30] << 8) +
-        md[31];
+        (static_cast<uint64_t>(md[28]) << 24) +
+        (static_cast<uint64_t>(md[29]) << 16) +
+        (static_cast<uint64_t>(md[30]) << 8) + static_cast<uint64_t>(md[31]);
     v &= mask;
 
     *p++ = v;
@@ -249,8 +250,9 @@ int cache_digest_hash(uint64_t &key, size_t nbits, const StringRef &s) {
         (static_cast<uint64_t>(md[25]) << 48) +
         (static_cast<uint64_t>(md[26]) << 40) +
         (static_cast<uint64_t>(md[27]) << 32) +
-        (static_cast<uint64_t>(md[28]) << 24) + (md[29] << 16) + (md[30] << 8) +
-        md[31];
+        (static_cast<uint64_t>(md[28]) << 24) +
+        (static_cast<uint64_t>(md[29]) << 16) +
+        (static_cast<uint64_t>(md[30]) << 8) + static_cast<uint64_t>(md[31]);
 
   key &= mask;