diff --git a/user_channel/usercommands.cpp b/user_channel/usercommands.cpp
index 489eeaf..5bdbbd3 100644
--- a/user_channel/usercommands.cpp
+++ b/user_channel/usercommands.cpp
@@ -130,7 +130,7 @@
 {
     uint8_t sessLimit = sessionLimit.value_or(0);
     uint8_t chNum =
-        convertCurrentChannelNum(static_cast<uint8_t>(channel), ctx);
+        convertCurrentChannelNum(static_cast<uint8_t>(channel), ctx->channel);
     if (reserved1 != 0 || reserved2 != 0 || sessLimit != 0 ||
         (!isValidChannel(chNum)) ||
         (!ipmiUserIsValidPrivilege(static_cast<uint8_t>(privilege))) ||
@@ -199,7 +199,7 @@
                       uint6_t userId, uint2_t reserved2)
 {
     uint8_t chNum =
-        convertCurrentChannelNum(static_cast<uint8_t>(channel), ctx);
+        convertCurrentChannelNum(static_cast<uint8_t>(channel), ctx->channel);
     if (reserved1 != 0 || reserved2 != 0 || (!isValidChannel(chNum)) ||
         (EChannelSessSupported::none == getChannelSessionSupport(chNum)))
     {
@@ -450,7 +450,7 @@
 {
 
     uint8_t channel =
-        convertCurrentChannelNum(static_cast<uint8_t>(chNum), ctx);
+        convertCurrentChannelNum(static_cast<uint8_t>(chNum), ctx->channel);
 
     if (reserved1 || reserved2 || !isValidChannel(channel) ||
         !isValidPrivLimit(static_cast<uint8_t>(privLevel)) ||