diff --git a/src/zapit/src/scannit.cpp b/src/zapit/src/scannit.cpp
index ff5575301..cfe6d0b90 100644
--- a/src/zapit/src/scannit.cpp
+++ b/src/zapit/src/scannit.cpp
@@ -308,7 +308,7 @@ bool CNit::ParseSatelliteDescriptor(SatelliteDeliverySystemDescriptor * sd, Tran
 	feparams.u.qpsk.fec_inner = (fe_code_rate_t) fec_inner;
 	feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000);
 
-	freq_id_t freq = feparams.frequency / 1000;
+	freq_id_t freq = CREATE_FREQ_ID(feparams->frequency, false);
 	transponder_id_t TsidOnid = CREATE_TRANSPONDER_ID64(
 			freq, satellitePosition, tsinfo->getTransportStreamId(), tsinfo->getOriginalNetworkId());
 
@@ -333,7 +333,7 @@ bool CNit::ParseCableDescriptor(CableDeliverySystemDescriptor * sd, TransportStr
 	if(feparams.frequency > 1000*1000)
 		feparams.frequency /= 1000;
 
-	freq_id_t freq = feparams.frequency / 1000;
+	freq_id_t freq = CREATE_FREQ_ID(feparams->frequency, true);
 	transponder_id_t TsidOnid = CREATE_TRANSPONDER_ID64(
 		freq, satellitePosition, tsinfo->getTransportStreamId(), tsinfo->getOriginalNetworkId());
 
@@ -347,7 +347,7 @@ bool CNit::ParseServiceList(ServiceListDescriptor * sd, TransportStreamInfo * ts
 	ServiceListItemConstIterator it;
 	for (it = slist->begin(); it != slist->end(); ++it) {
 		ServiceListItem * s = *it;
-
+		/* FIXME dont use freq_id / satellitePosition ? */
 		t_channel_id channel_id = CZapitChannel::makeChannelId(satellitePosition,
 				freq_id, tsinfo->getTransportStreamId(), tsinfo->getOriginalNetworkId(), s->getServiceId());
 		CServiceScan::getInstance()->AddServiceType(channel_id, s->getServiceType());