diff --git a/pandora/archive/extract.py b/pandora/archive/extract.py
index 7b6bf9061..1ae79aac9 100644
--- a/pandora/archive/extract.py
+++ b/pandora/archive/extract.py
@@ -236,7 +236,7 @@ def stream(video, target, profile, info, audio_track=0, flags={}):
             ]
         if info['video'][0].get("force_framerate"):
             video_settings += ['-r:v', str(fps)]
-        video_settings += ['-map', '0:%s,0:0' % info['video'][0]['id']]
+        video_settings += ['-map', '0:v:0']
         audio_only = False
     else:
         video_settings = ['-vn']
@@ -261,7 +261,7 @@ def stream(video, target, profile, info, audio_track=0, flags={}):
             mono_mix = True
         else:
             mono_mix = False
-            audio_settings += ['-map', '0:%s,0:%s' % (info['audio'][audio_track]['id'], n)]
+            audio_settings += ['-map', '0:a:0']
         audio_settings += ['-ar', str(audiorate)]
         if audio_codec != 'libopus':
             audio_settings += ['-aq', str(audioquality)]