diff --git a/src/Mod/Path/PathScripts/post/rrf_post.py b/src/Mod/Path/PathScripts/post/rrf_post.py
index 570d802a40..9bd976018c 100644
--- a/src/Mod/Path/PathScripts/post/rrf_post.py
+++ b/src/Mod/Path/PathScripts/post/rrf_post.py
@@ -595,12 +595,12 @@ def parse(pathobj):
                     out += linenumber() + '(Begin toolchange)\n'
 
                 if OUTPUT_TOOL_CHANGE:
+                    for line in TOOL_CHANGE.splitlines(True):
+                        out += linenumber() + line + '\n'
                     outlist[0] = ' '
                     outlist[-1] =('T' + str(int(c.Parameters['T'])))
 
                 if not OUTPUT_TOOL_CHANGE and OUTPUT_COMMENTS:
-                    for line in TOOL_CHANGE.splitlines(True):
-                        out += linenumber() + line + '\n'
 # next 2 lines could also be replaced by a single line as "outlist = []"                   
                     outlist[0] = ' ' 
                     outlist[-1] = ' '