diff --git a/pysaliency/external_datasets/salicon.py b/pysaliency/external_datasets/salicon.py
index 4413c5d..8387e0f 100644
--- a/pysaliency/external_datasets/salicon.py
+++ b/pysaliency/external_datasets/salicon.py
@@ -210,14 +210,14 @@ def _get_SALICON_fixations(location, name, edition='2015', fixation_type='mouse'
 
             fixations_train, fixations_val = fixations
 
+            if edition == '2017' and fixation_type == 'mouse':
+                fixations_train = clip_out_of_stimulus_fixations(fixations_train, width=640, height=480)
+                fixations_val = clip_out_of_stimulus_fixations(fixations_val, width=640, height=480)
+
             if location is not None:
                 fixations_train.to_hdf5(os.path.join(location, 'fixations_train.hdf5'))
                 fixations_val.to_hdf5(os.path.join(location, 'fixations_val.hdf5'))
 
-        if edition == '2017' and fixation_type == 'mouse':
-            fixations_train = clip_out_of_stimulus_fixations(fixations_train, width=640, height=480)
-            fixations_val = clip_out_of_stimulus_fixations(fixations_val, width=640, height=480)
-
         return fixations_train, fixations_val