diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index af962b67..0670319e 100644
--- a/src/descrambler/capmt.c
+++ b/src/descrambler/capmt.c
@@ -584,7 +584,7 @@ capmt_thread(void *aux)
         idnode_set_t *is = idnode_find_all(&linuxdvb_adapter_class);
         for (i = 0; i < is->is_count; i++) {
           la = (linuxdvb_adapter_t*)is->is_array[i];
-#if 0
+#if TODO_FIXME
           if (!la || !la->mi_is_enabled) continue;
           if (!la->mi_is_enabled((mpegts_input_t*)la)) continue;
 #endif
@@ -658,7 +658,7 @@ capmt_table_input(struct th_descrambler *td, struct service *s,
   lfe = (linuxdvb_frontend_t*)t->s_dvb_active_input;
   if (!idnode_is_instance(&lfe->ti_id, &linuxdvb_frontend_class))
     return;
-  //adapter_num = ((linuxdvb_adapter_t*)lfe->lh_parent)->la_dvb_number;
+  adapter_num = lfe->lfe_adapter->la_dvb_number;
 
   caid_t *c;
 
@@ -897,7 +897,7 @@ capmt_service_start(service_t *s)
   lfe = (linuxdvb_frontend_t*)t->s_dvb_active_input;
   if (!idnode_is_instance(&lfe->ti_id, &linuxdvb_frontend_class))
     return;
-  //tuner = ((linuxdvb_adapter_t*)lfe->lh_parent)->la_dvb_number;
+  tuner = lfe->lfe_adapter->la_dvb_number;
 
   TAILQ_FOREACH(capmt, &capmts, capmt_link) {
     /* skip, if we're not active */