diff --git a/BDInfo/BDROM/TSCodecHEVC.cs b/BDInfo/BDROM/TSCodecHEVC.cs
index a66ba44d2..16be187b2 100644
--- a/BDInfo/BDROM/TSCodecHEVC.cs
+++ b/BDInfo/BDROM/TSCodecHEVC.cs
@@ -565,6 +565,7 @@ public static void Scan(TSVideoStream stream, TSStreamBuffer buffer, ref string
                     }
 
                     buffer.BSSkipNextByte();
+                    buffer.BSSkipBytes((int)(lastStreamPos - buffer.Position), true);
                 }
             } while ((buffer.Position < buffer.Length - 3) &&
                      (!_isInitialized || (_isInitialized && !frameTypeRead)));
diff --git a/BDInfo/BDROM/TSStreamFile.cs b/BDInfo/BDROM/TSStreamFile.cs
index fe0e37d9c..bbbb1fe7a 100644
--- a/BDInfo/BDROM/TSStreamFile.cs
+++ b/BDInfo/BDROM/TSStreamFile.cs
@@ -973,6 +973,8 @@ public void Scan(List<TSPlaylistFile> playlists, bool isFullScan)
                                                     }
                                                     */
                                                     CreateStream(streamPID, streamType, streamDescriptors);
+                                                    if (Streams[streamPID].IsGraphicsStream)
+                                                        Streams[streamPID].IsInitialized = !isFullScan;
                                                 }
                                                 k += streamInfoLength;
                                             }