diff --git a/src/input/mpegts/mpegts_service.c b/src/input/mpegts/mpegts_service.c
index 46e9c24..fc962ba 100644
--- a/src/input/mpegts/mpegts_service.c
+++ b/src/input/mpegts/mpegts_service.c
@@ -342,14 +342,13 @@ mpegts_service_enlist_raw
     /* Set weight to -1 (forced) for already active mux */
     if (mmi->mmi_mux->mm_active == mmi) {
       w = -1;
-      p = -1;
     } else {
       w = mi->mi_get_weight(mi, mmi->mmi_mux, flags, weight);
-      p = mi->mi_get_priority(mi, mmi->mmi_mux, flags);
       if (w > 0 && mi->mi_free_weight &&
           weight >= mi->mi_free_weight && w < mi->mi_free_weight)
         w = 0;
     }
+    p = mi->mi_get_priority(mi, mmi->mmi_mux, flags);

     service_instance_add(sil, t, mi->mi_instance, mi->mi_name, p, w);
     added++;
diff --git a/src/service.c b/src/service.c
index 99a8770..ced4694 100644
--- a/src/service.c
+++ b/src/service.c
@@ -869,15 +869,15 @@ service_find_instance

   /* Forced, handle priority settings */
   si = NULL;
-  TAILQ_FOREACH(next, sil, si_link)
+/*  TAILQ_FOREACH(next, sil, si_link)
     if (next->si_weight < 0 && next->si_error == 0)
       if (si == NULL || next->si_prio > si->si_prio)
-        si = next;
+        si = next;*/

   /* Idle */
   if (!si) {
     TAILQ_FOREACH_REVERSE(si, sil, service_instance_list, si_link)
-      if (si->si_weight == 0 && si->si_error == 0)
+      if (si->si_weight <= 0 && si->si_error == 0)
         break;
   }

@@ -1879,7 +1879,7 @@ si_cmp(const service_instance_t *a, const service_instance_t *b)
   r = a->si_prio - b->si_prio;

:
-    r = a->si_weight - b->si_weight;
+    r = b->si_weight - a->si_weight;
   return r;
 }