diff --git a/mriqc/workflows/diffusion/base.py b/mriqc/workflows/diffusion/base.py
index 1f24c299..74e4a67c 100644
--- a/mriqc/workflows/diffusion/base.py
+++ b/mriqc/workflows/diffusion/base.py
@@ -214,10 +214,11 @@ def dmri_qc_workflow(name='dwiMRIQC'):
         (dwi_reference_wf, ema, [('outputnode.ref_file', 'inputnode.epi_mean')]),
         (dmri_bmsk, drift, [('outputnode.out_mask', 'brainmask_file')]),
         (dmri_bmsk, ema, [('outputnode.out_mask', 'inputnode.epi_mask')]),
-        (drift, hmcwf, [('out_full_file', 'inputnode.reference')]),
+        (drift, hmcwf, [('out_full_file', 'inputnode.in_file')]),
         (drift, averages, [('out_full_file', 'in_file')]),
         (drift, stddev, [('out_full_file', 'in_file')]),
         (shells, averages, [('b_masks', 'in_weights')]),
+        (averages, hmcwf, [(('out_file', _first), 'inputnode.reference')]),
         (shells, stddev, [('b_masks', 'in_weights')]),
         (shells, dti_filter, [('out_data', 'bvals')]),
         (meta, dti_filter, [('out_bvec_file', 'bvec_file')]),