Index: fact/tools/rootmacros/PulseTemplates/rootfilehandler.C
===================================================================
--- fact/tools/rootmacros/PulseTemplates/rootfilehandler.C	(revision 13610)
+++ fact/tools/rootmacros/PulseTemplates/rootfilehandler.C	(revision 13611)
@@ -85,10 +85,10 @@
     {
         tf->cd();
-        tf->mkdir(subdirectory,subdirectory);
-        tf->cd(subdirectory);
     }
     else
     {
         tf->cd();
+        tf->mkdir(subdirectory,subdirectory);
+        tf->cd(subdirectory);
     }
     histList->Write(); // write the major histograms into the top level directory