diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/radinclusive_extra_outputs.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/radinclusive_extra_outputs.py
index 6012dfd06752268266a3c9ea90bca3a5d17e7111..9d4c3b62d3e6e6793723e19ad9a3d7b41a4e3028 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/radinclusive_extra_outputs.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/radinclusive_extra_outputs.py
@@ -17,42 +17,39 @@ from RecoConf.reconstruction_objects import make_pvs
 from GaudiKernel.SystemOfUnits import GeV
 
 
-def charged_hadrons(particles=make_long_kaons(),
-                    pvs=make_pvs(),
+def charged_hadrons(particles=make_long_kaons,
+                    pvs=make_pvs,
                     pt_min=1.2 * GeV,
                     ipchi2_min=150.):
     return basic_builder.filter_extra_charged_hadrons(
-        particles,
-        pvs,
+        particles(),
+        pvs(),
         pt_min=pt_min,
         ipchi2_min=ipchi2_min,
     )
 
 
-def neutral_hadrons(particles,
-                    pvs=make_pvs(),
-                    pt_min=1.2 * GeV,
-                    ipchi2_min=5.0):
+def neutral_hadrons(particles, pvs=make_pvs, pt_min=1.2 * GeV, ipchi2_min=5.0):
     return basic_builder.filter_neutral_hadrons(
         particles,
-        pvs,
+        pvs(),
         pt_min=pt_min,
         ipchi2_min=ipchi2_min,
     )
 
 
-def gamma(particles=make_photons(), pvs=make_pvs(), pt_min=3.3 * GeV):
+def gamma(particles=make_photons, pvs=make_pvs, pt_min=3.3 * GeV):
     return basic_builder.filter_photons(
-        particles,
-        pvs,
+        particles(),
+        pvs(),
         pt_min=pt_min,
         p_min=0.,
     )
 
 
-def pi0(particles, pvs=make_pvs(), pt_min=3.3 * GeV):
+def pi0(particles, pvs=make_pvs, pt_min=3.3 * GeV):
     return basic_builder.filter_pi0(
         particles,
-        pvs,
+        pvs(),
         pt_min=pt_min,
     )
diff --git a/Hlt/Hlt2Conf/tests/qmtest/test_hlt2_all_lines_with_reco.qmt b/Hlt/Hlt2Conf/tests/qmtest/test_hlt2_all_lines_with_reco.qmt
index 4b02d8f8e673baf3c1956f71fc8635bce15259f8..d09d8f2a0a3ae0b61680d33e6632484d13f3aa22 100644
--- a/Hlt/Hlt2Conf/tests/qmtest/test_hlt2_all_lines_with_reco.qmt
+++ b/Hlt/Hlt2Conf/tests/qmtest/test_hlt2_all_lines_with_reco.qmt
@@ -47,5 +47,17 @@ max_expected_decisions = 20
 for line, positive_decisions in matches:
     if int(positive_decisions) > max_expected_decisions:
         causes.append('{} positive decisions found for {}'.format(positive_decisions, line))
+
+
+
+# make sure that nobody configures something using reco from file
+if 'UnpackNeutralProtos.OutputLevel' in result['job_opts_dump']:
+    causes.append("Found configured UnpackNeutralProtos in job_opts_dump")
+if 'UnpackChargedProtos.OutputLevel' in result['job_opts_dump']:
+    causes.append("Found configured UnpackChargedProtos in job_opts_dump")
+if 'UnpackRecVertices.OutputLevel' in result['job_opts_dump']:
+    causes.append("Found configured UnpackRecVertices in job_opts_dump")
+
+
 </text></argument>
 </extension>