diff --git a/src/mpegparser/M2VParser.cpp b/src/mpegparser/M2VParser.cpp
index 0c6393cc4..b9a4ff425 100644
--- a/src/mpegparser/M2VParser.cpp
+++ b/src/mpegparser/M2VParser.cpp
@@ -218,10 +218,13 @@ void M2VParser::StampFrame(MPEGFrame* frame){
   previousDuration = frame->duration;
 
   if(frame->frameType == 'P'){
-    frame->firstRef = (MediaTime)(frame->firstRef * timeunit);
+    frame->firstRef = firstRef;
+    ShoveRef(previousTimecode);
   }else if(frame->frameType == 'B'){
-    frame->firstRef = (MediaTime)(frame->firstRef * timeunit);
-    frame->secondRef = (MediaTime)(frame->secondRef * timeunit);
+    frame->firstRef = firstRef;
+    frame->secondRef = secondRef;
+  } else{
+    ShoveRef(previousTimecode);
   }
   frame->stamped = true;
 }
@@ -333,8 +336,6 @@ int32_t M2VParser::PrepareFrame(MPEGChunk* chunk, MediaTime timecode, MPEG2Pictu
   }
 
   outBuf->timecode = timecode; // Still the sequence number
-  outBuf->firstRef = firstRef;
-  outBuf->secondRef = secondRef;
 
   outBuf->invisible = invisible;
   outBuf->duration = GetFrameDuration(picHdr);
@@ -358,6 +359,11 @@ void M2VParser::ShoveRef(MediaTime ref){
   }
 }
 
+void M2VParser::ClearRef(){
+  firstRef  = -1;
+  secondRef = -1;
+}
+
 //Maintains the time of the last start of GOP and uses the temporal_reference
 //field as an offset.
 int32_t M2VParser::FillQueues(){
@@ -389,6 +395,12 @@ int32_t M2VParser::FillQueues(){
         if(m_gopHdr.brokenLink){
           mxinfo(Y("Found group of picture with broken link. You may want use smart reencode before attempting to multiplex it.\n"));
         }
+        // There are too many broken videos to do the following so ReferenceBlock will be wrong for broken videos.
+        /*
+        if(m_gopHdr.closedGOP){
+          ClearRef();
+        }
+        */
       } else if (chunk->GetType() == MPEG_VIDEO_SEQUENCE_START_CODE) {
         if (seqHdrChunk)
           delete seqHdrChunk;
@@ -417,13 +429,11 @@ int32_t M2VParser::FillQueues(){
     switch(picHdr.frameType){
       case MPEG2_I_FRAME:
         PrepareFrame(chunk, myTime, picHdr);
-        ShoveRef(myTime);
         notReachedFirstGOP = false;
         break;
       case MPEG2_P_FRAME:
         if(firstRef == -1) break;
         PrepareFrame(chunk, myTime, picHdr);
-        ShoveRef(myTime);
         break;
       default: //B-frames
         if(firstRef == -1 || secondRef == -1){
diff --git a/src/mpegparser/M2VParser.h b/src/mpegparser/M2VParser.h
index db9ad251f..70feecac3 100644
--- a/src/mpegparser/M2VParser.h
+++ b/src/mpegparser/M2VParser.h
@@ -93,6 +93,7 @@ private:
   void DumpQueues();
   int32_t FillQueues();
   void ShoveRef(MediaTime ref);
+  void ClearRef();
   MediaTime GetFrameDuration(MPEG2PictureHeader picHdr);
   void FlushWaitQueue();
   int32_t OrderFrame(MPEGFrame* frame);