diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp
index 1ba9e2d4c..903b8ef6a 100644
--- a/src/zapit/src/femanager.cpp
+++ b/src/zapit/src/femanager.cpp
@@ -41,7 +41,7 @@
 #include <hardware/dmx.h>
 #include <OpenThreads/ScopedLock>

-static int fedebug = 0;
+static int fedebug = 1;
 static int unused_demux;
 static int noSameFE = 0;
 extern Zapit_config zapitCfg;
@@ -598,7 +598,12 @@ CFrontend * CFEManager::getFrontend(CZapitChannel * channel)
                if (mfe->getMode() == CFrontend::FE_MODE_UNUSED || CFrontend::linked(mfe->getMode()))
                        continue;

-               if (mfe->hasSat()) {
+               if ((mfe->hasCable() && SAT_POSITION_CABLE(satellitePosition)) || (mfe->hasTerr() && SAT_POSITION_TERR(satellitePosition)))
+               {
+                       retfe = mfe;
+               }
+               else if (mfe->hasSat())
+               {
                        satellite_map_t & satmap = mfe->getSatellites();
                        sat_iterator_t sit = satmap.find(satellitePosition);
                        if ((sit == satmap.end()) || !sit->second.configured)