diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c
index 64bfd33..30dab44 100644
--- a/libeplayer3/container/container_ffmpeg.c
+++ b/libeplayer3/container/container_ffmpeg.c
@@ -2053,11 +2053,11 @@ int32_t container_ffmpeg_update_tracks(Context_t *context, char *filename, int32
 				}
 			}
 		}
-#if 0
 		uint32_t i = 0;
 		for (i = 0; i < avContext->nb_chapters; i++)
 		{
 			Track_t track;
+			memset(&track, 0, sizeof(track));
 			AVChapter *ch = avContext->chapters[i];
 			AVDictionaryEntry *title = av_dict_get(ch->metadata, "title", NULL, 0);
 			int chstart = ch->start * av_q2d(ch->time_base);
@@ -2083,7 +2083,7 @@ int32_t container_ffmpeg_update_tracks(Context_t *context, char *filename, int32
 				}
 			}
 		}
-#endif
+
 		uint32_t n = 0;
 		for (n = 0; n < avContext->nb_streams; n++)
 		{
diff --git a/libeplayer3/playback/playback.c b/libeplayer3/playback/playback.c
index 5ebd394..fb22d90 100644
--- a/libeplayer3/playback/playback.c
+++ b/libeplayer3/playback/playback.c
@@ -242,6 +242,7 @@ static int PlaybackClose(Context_t *context)
 
 	context->manager->audio->Command(context, MANAGER_DEL, NULL);
 	context->manager->video->Command(context, MANAGER_DEL, NULL);
+	context->manager->chapter->Command(context, MANAGER_DEL, NULL);
 
 	context->playback->isPaused     = 0;
 	context->playback->isPlaying    = 0;