diff --git a/src/meta/genh.c b/src/meta/genh.c
index fcb5d58c..43d6e796 100644
--- a/src/meta/genh.c
+++ b/src/meta/genh.c
@@ -226,6 +226,8 @@ VGMSTREAM * init_vgmstream_genh(STREAMFILE *streamFile) {
             goto mpeg_fail;
         }
 
+        mpg123_param(data->m,MPG123_REMOVE_FLAGS,MPG123_GAPLESS,0.0);
+
         if (mpg123_open_feed(data->m)!=MPG123_OK) {
             goto mpeg_fail;
         }
diff --git a/src/vgmstream.c b/src/vgmstream.c
index be6d1324..2ab41507 100644
--- a/src/vgmstream.c
+++ b/src/vgmstream.c
@@ -673,8 +673,8 @@ int vgmstream_do_loop(VGMSTREAM * vgmstream) {
 
                 mpg123_feedseek(data->m,vgmstream->loop_sample,
                         SEEK_SET,&input_offset);
-                vgmstream->ch[0].offset =
-                    vgmstream->ch[0].channel_start_offset + input_offset;
+                vgmstream->loop_ch[0].offset =
+                    vgmstream->loop_ch[0].channel_start_offset + input_offset;
                 data->buffer_full = data->buffer_used = 0;
             }
 #endif