diff --git a/src/devices/wifi/minstrel-wifi-manager.cc b/src/devices/wifi/minstrel-wifi-manager.cc
index 2337f0f44..21fd7b433 100644
--- a/src/devices/wifi/minstrel-wifi-manager.cc
+++ b/src/devices/wifi/minstrel-wifi-manager.cc
@@ -486,7 +486,7 @@ MinstrelWifiManager::DoGetRtsMode (WifiRemoteStation *st)
 bool 
 MinstrelWifiManager::IsLowLatency (void) const
 {
-  return false;
+  return true;
 }
 uint32_t 
 MinstrelWifiManager::GetNextSample (MinstrelWifiRemoteStation *station)
@@ -782,7 +782,7 @@ MinstrelWifiManager::InitSampleTable (MinstrelWifiRemoteStation *station)
             {
               newIndex = (newIndex + 1)%GetNSupported (station);
             }
-          station->m_sampleTable[newIndex][col] = i+1;
+          station->m_sampleTable[newIndex][col] = i;
 
         }
     }