diff -rupN ns-allinone-3.22/ns-3.22/src/wimax/model/bs-scheduler.cc ns-allinone-3.22-modified/ns-3.22/src/wimax/model/bs-scheduler.cc
--- ns-allinone-3.22/ns-3.22/src/wimax/model/bs-scheduler.cc	2015-02-06 00:46:22.000000000 +0100
+++ ns-allinone-3.22-modified/ns-3.22/src/wimax/model/bs-scheduler.cc	2015-04-20 15:19:00.844041253 +0200
@@ -109,7 +109,8 @@ BSScheduler::CheckForFragmentation (Ptr<
   if (availableByte > headerSize)
     {
       NS_LOG_INFO ("\t Fragmentation IS possible");
-      return true;
+      return false;
+      //return true;
     }
   else
     {
diff -rupN ns-allinone-3.22/ns-3.22/src/wimax/model/simple-ofdm-wimax-phy.cc ns-allinone-3.22-modified/ns-3.22/src/wimax/model/simple-ofdm-wimax-phy.cc
--- ns-allinone-3.22/ns-3.22/src/wimax/model/simple-ofdm-wimax-phy.cc	2015-02-06 00:46:23.000000000 +0100
+++ ns-allinone-3.22-modified/ns-3.22/src/wimax/model/simple-ofdm-wimax-phy.cc	2015-04-20 15:18:29.232040740 +0200
@@ -885,30 +885,30 @@ SimpleOfdmWimaxPhy::DoGetFrameDuration (
   switch (frameDurationCode)
     {
     case FRAME_DURATION_2_POINT_5_MS:
-      return Seconds (2.5);
+      return MilliSeconds (2.5);
       break;
     case FRAME_DURATION_4_MS:
-      return Seconds (4);
+      return MilliSeconds (4);
       break;
     case FRAME_DURATION_5_MS:
-      return Seconds (5);
+      return MilliSeconds (5);
       break;
     case FRAME_DURATION_8_MS:
-      return Seconds (8);
+      return MilliSeconds (8);
       break;
     case FRAME_DURATION_10_MS:
-      return Seconds (10);
+      return MilliSeconds (10);
       break;
     case FRAME_DURATION_12_POINT_5_MS:
-      return Seconds (12.5);
+      return MilliSeconds (12.5);
       break;
     case FRAME_DURATION_20_MS:
-      return Seconds (20);
+      return MilliSeconds (20);
       break;
     default:
       NS_FATAL_ERROR ("Invalid modulation type");
     }
-  return Seconds (0);
+  return MilliSeconds (0);
 }
 
 /*