diff --git a/src/input/mpegts.h b/src/input/mpegts.h
index b81865e7..664460d9 100644
--- a/src/input/mpegts.h
+++ b/src/input/mpegts.h
@@ -417,7 +417,7 @@ int mpegts_input_is_free ( mpegts_input_t *mi );
 int mpegts_input_current_weight ( mpegts_input_t *mi );
 
 void mpegts_table_dispatch
-  (mpegts_table_t *mt, const uint8_t *sec, int r);
+  (const uint8_t *sec, size_t r, void *mt);
 void mpegts_table_release
   (mpegts_table_t *mt);
 void mpegts_table_add
diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index 4073c946..7adf8226 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -148,7 +148,8 @@ mpegts_input_table_dispatch ( mpegts_mux_t *mm, mpegts_table_feed_t *mtf )
   for (i = 0; i < len; i++) {
     mt = vec[i];
     if (!mt->mt_destroyed && mt->mt_pid == pid)
-      psi_section_reassemble(&mt->mt_sect, mtf->mtf_tsb, 0, NULL, mt);
+      psi_section_reassemble(&mt->mt_sect, mtf->mtf_tsb, 0,
+                             mpegts_table_dispatch, mt);
     mpegts_table_release(mt);
   }
 }
diff --git a/src/input/mpegts/mpegts_table.c b/src/input/mpegts/mpegts_table.c
index 3479fa35..aded6467 100644
--- a/src/input/mpegts/mpegts_table.c
+++ b/src/input/mpegts/mpegts_table.c
@@ -23,9 +23,10 @@
 
 void
 mpegts_table_dispatch
-  ( mpegts_table_t *mt, const uint8_t *sec, int r )
+  ( const uint8_t *sec, size_t r, void *aux )
 {
   int tid, len, ret;
+  mpegts_table_t *mt = aux;
   int chkcrc = mt->mt_flags & MT_CRC;
 
   if(mt->mt_destroyed)
diff --git a/src/input/mpegts/psi.c b/src/input/mpegts/psi.c
index 22110f39..bea76a7a 100644
--- a/src/input/mpegts/psi.c
+++ b/src/input/mpegts/psi.c
@@ -125,7 +125,8 @@ psi_section_reassemble0(psi_section_t *ps, const uint8_t *data,
     return -1;
 
   ps->ps_offset = 0;
-  cb(ps->ps_data, tsize - (crc ? 4 : 0), opaque);
+  if (cb)
+    cb(ps->ps_data, tsize - (crc ? 4 : 0), opaque);
   return len - excess;
 }