diff --git a/brkraw/lib/utils.py b/brkraw/lib/utils.py
index ae4a900..28094ca 100644
--- a/brkraw/lib/utils.py
+++ b/brkraw/lib/utils.py
@@ -402,6 +402,7 @@ def build_bids_json(dset, row, fname, json_path, slope=False, offset=False):
         crop = [int(row.Start), int(row.End)]
     else:
         crop = None
+    fname = '{}_{}'.format(fname, row.modality)
     if dset.is_multi_echo(row.ScanID, row.RecoID):  # multi_echo
         nii_objs = dset.get_niftiobj(row.ScanID, row.RecoID, crop=crop, slope=slope, offset=offset)
         n_echo = len(nii_objs)
@@ -416,7 +417,6 @@ def build_bids_json(dset, row, fname, json_path, slope=False, offset=False):
                 dset.save_json(row.ScanID, row.RecoID, currentFileName, dir=row.Dir,
                                metadata=ref, condition=['me', echo])
     else:
-        fname = '{}_{}'.format(fname, row.modality)
         dset.save_as(row.ScanID, row.RecoID, fname, dir=row.Dir, crop=crop, slope=slope, offset=offset)
         if re.search('dwi', row.modality, re.IGNORECASE):
             # DTI parameter (FSL style)