diff --git a/modules/demux/adaptive/playlist/SegmentTemplate.cpp b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
index 64907ff248d4a7bfe967b5e362b4176857f824c3..2bef4b3d40e75390bcf8683a39c3d9a9b5f9f7d9 100644
--- a/modules/demux/adaptive/playlist/SegmentTemplate.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
@@ -31,13 +31,12 @@
 
 using namespace adaptive::playlist;
 
-SegmentTemplateSegment::SegmentTemplateSegment( SegmentTemplate *templ_,
-                                                ICanonicalUrl *parent ) :
+SegmentTemplateSegment::SegmentTemplateSegment( ICanonicalUrl *parent ) :
     Segment( parent )
 {
     debugName = "SegmentTemplateSegment";
     templated = true;
-    templ = templ_;
+    templ = nullptr;
 }
 
 SegmentTemplateSegment::~SegmentTemplateSegment()
@@ -50,12 +49,19 @@ void SegmentTemplateSegment::setSourceUrl(const std::string &url)
     sourceUrl = Url(Url::Component(url, templ));
 }
 
-SegmentTemplate::SegmentTemplate( SegmentInformation *parent ) :
+void SegmentTemplateSegment::setParentTemplate( SegmentTemplate *templ_ )
+{
+    templ = templ_;
+}
+
+SegmentTemplate::SegmentTemplate( SegmentTemplateSegment *seg, SegmentInformation *parent ) :
     AbstractMultipleSegmentBaseType( parent, AbstractAttr::Type::SegmentTemplate )
 {
     initialisationSegment.Set( nullptr );
     parentSegmentInformation = parent;
-    virtualsegment = new SegmentTemplateSegment( this, parent );
+    virtualsegment = seg;
+    virtualsegment->setParent( parentSegmentInformation );
+    virtualsegment->setParentTemplate( this );
 }
 
 SegmentTemplate::~SegmentTemplate()
diff --git a/modules/demux/adaptive/playlist/SegmentTemplate.h b/modules/demux/adaptive/playlist/SegmentTemplate.h
index e55ead23b7b8d25aa9ff19cb8ecfcde3a58f8c33..63f2a107fc4e1808077ceb8d863f2d85825e6d58 100644
--- a/modules/demux/adaptive/playlist/SegmentTemplate.h
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.h
@@ -39,9 +39,10 @@ namespace adaptive
         class SegmentTemplateSegment : public Segment
         {
             public:
-                SegmentTemplateSegment( SegmentTemplate *, ICanonicalUrl * = nullptr );
+                SegmentTemplateSegment( ICanonicalUrl * = nullptr );
                 virtual ~SegmentTemplateSegment();
                 virtual void setSourceUrl( const std::string &url ); /* reimpl */
+                void setParentTemplate( SegmentTemplate * );
 
             protected:
                 const SegmentTemplate *templ;
@@ -50,7 +51,7 @@ namespace adaptive
         class SegmentTemplate : public AbstractMultipleSegmentBaseType
         {
             public:
-                SegmentTemplate( SegmentInformation * = nullptr );
+                SegmentTemplate( SegmentTemplateSegment *, SegmentInformation * = nullptr );
                 virtual ~SegmentTemplate();
                 void setSourceUrl( const std::string &url );
                 uint64_t getLiveTemplateNumber(vlc_tick_t, bool = true) const;
diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp b/modules/demux/dash/mpd/IsoffMainParser.cpp
index d191e3fad57d235f709a65165f42b8d4507e352f..bf9087e0cf3ce8975729e15297f68a918151f528 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.cpp
+++ b/modules/demux/dash/mpd/IsoffMainParser.cpp
@@ -237,7 +237,7 @@ size_t IsoffMainParser::parseSegmentTemplate(MPD *mpd, Node *templateNode, Segme
     if(templateNode->hasAttribute("media"))
         mediaurl = templateNode->getAttributeValue("media");
 
-    SegmentTemplate *mediaTemplate = new (std::nothrow) SegmentTemplate(info);
+    SegmentTemplate *mediaTemplate = new (std::nothrow) SegmentTemplate(new SegmentTemplateSegment(), info);
     if(!mediaTemplate)
         return total;
     mediaTemplate->setSourceUrl(mediaurl);
diff --git a/modules/demux/smooth/playlist/Parser.cpp b/modules/demux/smooth/playlist/Parser.cpp
index 23471e2743143d5158882408bf4c2225845fdd55..387fe8a9bc0b7cb9304c3464c571bbf5a62c9848 100644
--- a/modules/demux/smooth/playlist/Parser.cpp
+++ b/modules/demux/smooth/playlist/Parser.cpp
@@ -237,7 +237,7 @@ static void ParseStreamIndex(BasePeriod *period, Node *streamIndexNode, unsigned
         if(!url.empty())
         {
             /* SmoothSegment is a template holder */
-            SmoothSegmentTemplate *templ = new SmoothSegmentTemplate(adaptSet);
+            SegmentTemplate *templ = new SegmentTemplate(new SmoothSegmentTemplateSegment(), adaptSet);
             if(templ)
             {
                 templ->setSourceUrl(url);
diff --git a/modules/demux/smooth/playlist/SmoothSegment.cpp b/modules/demux/smooth/playlist/SmoothSegment.cpp
index 706db863e89339b44c66e6d1ff4b4be29bfdf17a..e04bdefc0a2e7e0c9a11a29a729248a80e7c09bf 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.cpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.cpp
@@ -64,19 +64,20 @@ void SmoothSegmentChunk::onDownload(block_t **pp_block)
     }
 }
 
-SmoothSegmentTemplate::SmoothSegmentTemplate(SegmentInformation *parent) :
-    SegmentTemplate( parent )
+SmoothSegmentTemplateSegment::SmoothSegmentTemplateSegment(ICanonicalUrl *parent)
+    : SegmentTemplateSegment(parent)
 {
 
 }
 
-SmoothSegmentTemplate::~SmoothSegmentTemplate()
+SmoothSegmentTemplateSegment::~SmoothSegmentTemplateSegment()
 {
 
 }
 
-SegmentChunk* SmoothSegmentTemplate::createChunk(AbstractChunkSource *source, BaseRepresentation *rep)
+SegmentChunk* SmoothSegmentTemplateSegment::createChunk(AbstractChunkSource *source, BaseRepresentation *rep)
 {
      /* act as factory */
     return new (std::nothrow) SmoothSegmentChunk(source, rep);
 }
+
diff --git a/modules/demux/smooth/playlist/SmoothSegment.hpp b/modules/demux/smooth/playlist/SmoothSegment.hpp
index a04f65b4a2179d5573f565459d546b93a800d675..6eda4e7b5cd29833ae4783d3d0264d5dc6ef1005 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.hpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.hpp
@@ -33,15 +33,15 @@ namespace smooth
         {
             public:
                 SmoothSegmentChunk(AbstractChunkSource *, BaseRepresentation *);
-                ~SmoothSegmentChunk();
+                virtual ~SmoothSegmentChunk();
                 virtual void onDownload(block_t **); /* reimpl */
         };
 
-        class SmoothSegmentTemplate : public SegmentTemplate
+        class SmoothSegmentTemplateSegment : public SegmentTemplateSegment
         {
             public:
-                SmoothSegmentTemplate(SegmentInformation * = nullptr);
-                ~SmoothSegmentTemplate();
+                SmoothSegmentTemplateSegment( ICanonicalUrl * = nullptr );
+                virtual ~SmoothSegmentTemplateSegment();
                 virtual SegmentChunk* createChunk(AbstractChunkSource *, BaseRepresentation *); /* reimpl */
         };
     }