diff --git a/src/psi.c b/src/psi.c
index 51831d06..130678d5 100644
--- a/src/psi.c
+++ b/src/psi.c
@@ -612,6 +612,11 @@ psi_parse_pmt(service_t *t, const uint8_t *ptr, int len, int chksvcid,
 	st = service_stream_create(t, pid, hts_stream_type);
       }
 
+      // Jernej: I don't know why. But it seems that sometimes the stream is created with a wrong es_type??
+      if(st->es_type != hts_stream_type) {
+        st->es_type = hts_stream_type;
+      }
+
       st->es_delete_me = 0;
 
       if(st->es_position != position) {
@@ -893,7 +898,7 @@ static struct strtab streamtypetab[] = {
   { "MPEGTS",     SCT_MPEGTS },
   { "TEXTSUB",    SCT_TEXTSUB },
   { "EAC3",       SCT_EAC3 },
-  { "MP4A",       SCT_MP4A },
+  { "AAC",       SCT_MP4A },
 };
 
 
diff --git a/src/service.c b/src/service.c
index 6cba2da7..1a405d1a 100644
--- a/src/service.c
+++ b/src/service.c
@@ -856,11 +856,6 @@ service_build_stream_start(service_t *t)
     ssc->ssc_index = st->es_index;
     ssc->ssc_type  = st->es_type;
 
-    // Jernej says: I don't know how else?!
-    if (ssc->ssc_type == SCT_MP4A) {
-      ssc->ssc_type = SCT_AAC;
-    }
-
     memcpy(ssc->ssc_lang, st->es_lang, 4);
     ssc->ssc_composition_id = st->es_composition_id;
     ssc->ssc_ancillary_id = st->es_ancillary_id;