diff --git a/CorebootModulePkg/Library/CbParseLib/CbParseLib.c b/CorebootModulePkg/Library/CbParseLib/CbParseLib.c
index 5535fdcdd5..4dc74abb13 100644
--- a/CorebootModulePkg/Library/CbParseLib/CbParseLib.c
+++ b/CorebootModulePkg/Library/CbParseLib/CbParseLib.c
@@ -28,7 +28,7 @@
 
 static UINT64 cb_unpack64(struct cbuint64 val)
 {
-  return (((UINT64) val.hi) << 32) | val.lo;
+  return LShiftU64 (val.hi, 32) | val.lo;
 }
 
 static const char *cb_mb_vendor_string(const struct cb_mainboard *cbm)