diff --git a/src/Common/BitHelpers.h b/src/Common/BitHelpers.h
index 5ac49013ceb..95c627bf3e9 100644
--- a/src/Common/BitHelpers.h
+++ b/src/Common/BitHelpers.h
@@ -23,7 +23,7 @@ inline unsigned int bitScanReverse(unsigned int x)
 inline size_t roundUpToPowerOfTwoOrZero(size_t n)
 {
     // if MSB is set, return n, to avoid return zero
-    if (unlikely(n & 1ULL<<(sizeof(size_t)*CHAR_BIT-1)))
+    if (unlikely(n >= 0x8000000000000000ULL))
         return n;
 
     --n;