diff --git a/user_channel/channelcommands.cpp b/user_channel/channelcommands.cpp
index 865d764..cf2c998 100644
--- a/user_channel/channelcommands.cpp
+++ b/user_channel/channelcommands.cpp
@@ -169,8 +169,7 @@
         return IPMI_CC_REQ_DATA_LEN_INVALID;
     }
 
-    // TODO: Self channel number (0xE) has to be determined.
-    uint8_t chNum = req->chNum;
+    uint8_t chNum = convertCurrentChannelNum(req->chNum);
     if (!isValidChannel(chNum))
     {
         log<level::DEBUG>("Set channel access - Parameter out of range");
@@ -275,8 +274,7 @@
         return IPMI_CC_REQ_DATA_LEN_INVALID;
     }
 
-    // TODO: Self channel number (0xE) has to be determined.
-    uint8_t chNum = req->chNum;
+    uint8_t chNum = convertCurrentChannelNum(req->chNum);
     if (!isValidChannel(chNum))
     {
         log<level::DEBUG>("Get channel access - Parameter out of range");
@@ -342,8 +340,7 @@
         return IPMI_CC_REQ_DATA_LEN_INVALID;
     }
 
-    // TODO: Self channel number (0xE) has to be determined.
-    uint8_t chNum = req->chNum;
+    uint8_t chNum = convertCurrentChannelNum(req->chNum);
     if (!isValidChannel(chNum))
     {
         log<level::DEBUG>("Get channel info - Parameter out of range");