diff --git a/migrationTool/transform/PackageTransform.cs b/migrationTool/transform/PackageTransform.cs
index a696735..efb6c69 100644
--- a/migrationTool/transform/PackageTransform.cs
+++ b/migrationTool/transform/PackageTransform.cs
@@ -85,7 +85,7 @@ protected override async Task<string> TransformAsync(
                 var inputPaths = inputFiles.Select(f => Path.Combine(workingDirectory, f))
                     .ToArray();
 
-                // Anything not package and can be uploaded is uploaded directly.
+                // Anything not packaged and can be uploaded is uploaded directly.
                 var blobs = await container.GetListOfBlobsRemainingAsync(manifest, cancellationToken);
                 allTasks.Add(Task.WhenAll(blobs.Select(async blob =>
                 {
diff --git a/migrationTool/transform/ShakaPackager.cs b/migrationTool/transform/ShakaPackager.cs
index 95b9995..622e6c1 100644
--- a/migrationTool/transform/ShakaPackager.cs
+++ b/migrationTool/transform/ShakaPackager.cs
@@ -139,7 +139,8 @@ private IEnumerable<string> GetArguments(IList<string> inputs, IList<string> out
                     var stream = t.Type.ToString().ToLowerInvariant();
                     var language = string.IsNullOrEmpty(t.SystemLanguage) || t.SystemLanguage == "und" ? string.Empty : $",language={t.SystemLanguage},";
                     var role = t is TextTrack ? $",dash_role={values[text_tracks++ % values.Length].ToString().ToLowerInvariant()}" : string.Empty;
-                    return $"stream={t.TrackID - 1},in={inputFile},out={outputs[i]},playlist_name={manifests[i]}{language}{drm_label}{role}";
+                    var useType = SelectedTracks.Count(x => x.Source == t.Source && x.Type == t.Type) == 1;
+                    return $"stream={(useType ? stream: t.TrackID - 1)},in={inputFile},out={outputs[i]},playlist_name={manifests[i]}{language}{drm_label}{role}";
                 }
                 else
                 {