diff --git a/app/menu.c b/app/menu.c
index 1e37fefc5..e69138890 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -381,7 +381,7 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
 			break;
 		case MENU_SET_CTR:
 			*pMin = 1;
-			*pMax = 20;
+			*pMax = 15;
 			break;
         case MENU_SET_INV:
 			*pMin = 0;
diff --git a/settings.c b/settings.c
index 7fa080cbb..6a7e6b379 100644
--- a/settings.c
+++ b/settings.c
@@ -286,21 +286,8 @@ void SETTINGS_InitEEPROM(void)
 		gSetting_set_tot = (((Data[6] & 0xF0) >> 4) < 4) ? ((Data[6] & 0xF0) >> 4) : 0;
 		gSetting_set_ptt = (((Data[6] & 0x0F)) < 2) ? ((Data[6] & 0x0F)) : 0;
 
-		// 
-		// Special patch for 1.7
-		// Change me on 1.8
-		//
-		
-		if(Data[4] < 21)
-		{
-			gSetting_set_inv = 0;
-			gSetting_set_ctr = 10;
-		}
-		else
-		{
-			gSetting_set_inv = (((Data[5] & 0xF0) >> 4) < 2) ? ((Data[5] & 0xF0) >> 4) : 0;
-			gSetting_set_ctr = (((Data[5] & 0x0F)) < 21) ? ((Data[5] & 0x0F)) : 10;
-		}
+		gSetting_set_inv = (((Data[5] & 0xF0) >> 4) < 2) ? ((Data[5] & 0xF0) >> 4) : 0;
+		gSetting_set_ctr = (((Data[5] & 0x0F)) < 16) ? ((Data[5] & 0x0F)) : 5;
 
 		// And set special session settings for actions
 		gSetting_set_ptt_session = gSetting_set_ptt;