diff --git a/src/lte/model/fdbet-ff-mac-scheduler.cc b/src/lte/model/fdbet-ff-mac-scheduler.cc
index 5b509109d..8327409d7 100644
--- a/src/lte/model/fdbet-ff-mac-scheduler.cc
+++ b/src/lte/model/fdbet-ff-mac-scheduler.cc
@@ -1106,7 +1106,7 @@ FdBetFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sc
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = UINT16_MAX;
+          lcActives = 65536; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,uint8_t>::iterator itCqi;
diff --git a/src/lte/model/fdmt-ff-mac-scheduler.cc b/src/lte/model/fdmt-ff-mac-scheduler.cc
index f3b3f2955..a28fd8e78 100644
--- a/src/lte/model/fdmt-ff-mac-scheduler.cc
+++ b/src/lte/model/fdmt-ff-mac-scheduler.cc
@@ -1077,7 +1077,7 @@ FdMtFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sch
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = UINT16_MAX;
+          lcActives = 65536; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.cc b/src/lte/model/fdtbfq-ff-mac-scheduler.cc
index 991063516..6d060bd7e 100644
--- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc
+++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc
@@ -1327,7 +1327,7 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = UINT16_MAX;
+          lcActives = 65536; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc
index a7e9df4d2..5fb0d2fab 100644
--- a/src/lte/model/pf-ff-mac-scheduler.cc
+++ b/src/lte/model/pf-ff-mac-scheduler.cc
@@ -1093,7 +1093,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = UINT16_MAX;
+          lcActives = 65536; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
diff --git a/src/lte/model/pss-ff-mac-scheduler.cc b/src/lte/model/pss-ff-mac-scheduler.cc
index b28b16a4e..4ab17e64a 100644
--- a/src/lte/model/pss-ff-mac-scheduler.cc
+++ b/src/lte/model/pss-ff-mac-scheduler.cc
@@ -1392,7 +1392,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = UINT16_MAX;
+          lcActives = 65536; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
diff --git a/src/lte/model/tdbet-ff-mac-scheduler.cc b/src/lte/model/tdbet-ff-mac-scheduler.cc
index 0b08dda77..6569b7b9d 100644
--- a/src/lte/model/tdbet-ff-mac-scheduler.cc
+++ b/src/lte/model/tdbet-ff-mac-scheduler.cc
@@ -1029,7 +1029,7 @@ TdBetFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sc
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = UINT16_MAX;
+          lcActives = 65536; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,uint8_t>::iterator itCqi;
diff --git a/src/lte/model/tdmt-ff-mac-scheduler.cc b/src/lte/model/tdmt-ff-mac-scheduler.cc
index d3643b560..8cce4102c 100644
--- a/src/lte/model/tdmt-ff-mac-scheduler.cc
+++ b/src/lte/model/tdmt-ff-mac-scheduler.cc
@@ -1056,7 +1056,7 @@ TdMtFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sch
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = UINT16_MAX;
+          lcActives = 65536; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,uint8_t>::iterator itCqi;
diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.cc b/src/lte/model/tdtbfq-ff-mac-scheduler.cc
index ca7bf309d..e9cb899ea 100644
--- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc
+++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc
@@ -1102,7 +1102,7 @@ TdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = UINT16_MAX;
+          lcActives = 65536; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
diff --git a/src/lte/model/tta-ff-mac-scheduler.cc b/src/lte/model/tta-ff-mac-scheduler.cc
index 08f57778a..70cdf1789 100644
--- a/src/lte/model/tta-ff-mac-scheduler.cc
+++ b/src/lte/model/tta-ff-mac-scheduler.cc
@@ -1095,7 +1095,7 @@ TtaFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = UINT16_MAX;
+          lcActives = 65536; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;