diff --git a/src/zapit/src/sdt.cpp b/src/zapit/src/sdt.cpp
index e0720d82f..fad341fa6 100644
--- a/src/zapit/src/sdt.cpp
+++ b/src/zapit/src/sdt.cpp
@@ -397,25 +397,21 @@ int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const
 	memset(filter, 0x00, DMX_FILTER_SIZE);
 	memset(mask, 0x00, DMX_FILTER_SIZE);
 
+	memset(filter, 0x00, DMX_FILTER_SIZE);
 	filter[0] = 0x42;
 	filter[1] = (p_transport_stream_id >> 8) & 0xff;
 	filter[2] = p_transport_stream_id & 0xff;
-//	filter[3] = 0x00;
-	filter[4] = 0x00;
-	filter[5] = 0x00;
+	filter[4] = 0x00; 
 	filter[6] = (p_original_network_id >> 8) & 0xff;
 	filter[7] = p_original_network_id & 0xff;
-	//memset(&filter[8], 0x00, 8);
 
+	memset(mask, 0x00, DMX_FILTER_SIZE);
 	mask[0] = 0xFF;
 	mask[1] = 0xFF;
 	mask[2] = 0xFF;
-//	mask[3] = 0x00;
-	mask[4] = 0xFF;
-	mask[5] = 0xFF;
+	mask[4] = 0xFF; 
 	mask[6] = 0xFF;
 	mask[7] = 0xFF;
-//	memset(&mask[8], 0x00, 8);
 
 	std::vector<std::pair<int,int> > sidpmt;
 	int pat_ok = scan_parse_pat( sidpmt );
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index f7d667e5c..0b11af4fd 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -2229,17 +2229,14 @@ int zapit_main_thread(void *data)
 	/* create bouquet manager */
 	g_bouquetManager = new CBouquetManager();
 
-	bool tv_mode = true;
 	if (config.getInt32("lastChannelMode", 0)){
 		setRadioMode();
-		tv_mode = false;
 	}
 	else{
 		setTVMode();
-		tv_mode = true;
 	}
 	if(ZapStart_arg->uselastchannel == 0){
-		live_channel_id = tv_mode ? ZapStart_arg->startchanneltv_id : ZapStart_arg->startchannelradio_id;
+		live_channel_id = (currentMode & RADIO_MODE) ? ZapStart_arg->startchannelradio_id : ZapStart_arg->startchanneltv_id ;
 		lastChannelRadio = ZapStart_arg->startchannelradio_nr;
 		lastChannelTV    = ZapStart_arg->startchanneltv_nr;
 	}
@@ -2491,8 +2488,10 @@ printf("[sdt monitor] wakeup...\n");
 				curchans.clear();
 
 			ret = parse_current_sdt(transport_stream_id, original_network_id, satellitePosition, freq);
-			if(ret)
+			if(ret){
+				printf("[sdt monitor] scanSDT broken ?\n");
 				continue;
+			}
 			sdt_tp.insert(std::pair <transponder_id_t, bool> (tpid, true) );
 
 			char buffer[256];