diff --git a/app/watchdog.hpp b/app/watchdog.hpp
index a7ff62e..fa53ac7 100644
--- a/app/watchdog.hpp
+++ b/app/watchdog.hpp
@@ -22,8 +22,8 @@
 ipmi::RspType<> ipmiSetWatchdogTimer(
     uint3_t timerUse, uint3_t reserved, bool dontStopTimer, bool dontLog,
     uint3_t timeoutAction, uint1_t reserved1, uint3_t preTimeoutInterrupt,
-    uint1_t reserved2, uint8_t preTimeoutInterval, uint1_t reserved3,
-    uint5_t expFlagValue, uint2_t reserved4, uint16_t initialCountdown);
+    uint1_t reserved2, uint8_t preTimeoutInterval, std::bitset<8> expFlagValue,
+    uint16_t initialCountdown);
 
 /**@brief The getWatchdogTimer ipmi command.
  *
@@ -38,7 +38,7 @@
 ipmi::RspType<uint3_t, uint3_t, bool, bool,       // timerUse
               uint3_t, uint1_t, uint3_t, uint1_t, // timerAction
               uint8_t,                            // pretimeout
-              uint8_t,                            // expireFlags
+              std::bitset<8>,                     // expireFlags
               uint16_t, // initial Countdown - Little Endian (deciseconds)
               uint16_t  // present Countdown - Little Endian (deciseconds)
               >