diff --git a/tools/blast/macros.xml b/tools/blast/macros.xml
index 6163e5cacd9..967ffc34d3e 100644
--- a/tools/blast/macros.xml
+++ b/tools/blast/macros.xml
@@ -1,11 +1,11 @@
 <macros>
     <token name="@TOOL_VERSION@">1.7.0</token>
-    <token name="@VERSION_SUFFIX@">1</token>
+    <token name="@VERSION_SUFFIX@">2</token>
     <token name="@PROFILE@">20.09</token>
     <xml name="requirements">
         <requirements>
             <requirement type="package" version="@TOOL_VERSION@">magicblast</requirement>
-            <requirement type="package" version="1.16.1">samtools</requirement>
+            <requirement type="package" version="1.18">samtools</requirement>
         </requirements>
     </xml>
     <xml name="output_sort_param">
diff --git a/tools/blast/magicblast.xml b/tools/blast/magicblast.xml
index 92cc5d362b7..0d1402faf75 100644
--- a/tools/blast/magicblast.xml
+++ b/tools/blast/magicblast.xml
@@ -247,7 +247,7 @@ $output_options.no_discordant
     <outputs>
         <data name="output" format="bam" label="${tool.name} on ${on_string}">
             <change_format>
-                <when input="output.outfmt_cond.outfmt" value="tabular" format="tabular"/>
+                <when input="output_options.outfmt_cond.outfmt" value="tabular" format="tabular"/>
             </change_format>
         </data>
         <data name="output_unaligned" format="bam" label="${tool.name} on ${on_string}: unaligned reads">