diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
index 01d56d607e2..85e3929f77f 100644
--- a/Compiler/Template/CodegenC.tpl
+++ b/Compiler/Template/CodegenC.tpl
@@ -294,8 +294,10 @@ template functionInitSynchronous(list<ClockedPartition> clockedPartitions, Strin
   /* Initializes the clocks of model. */
   void <%symbolName(modelNamePrefix,"function_initSynchronous")%>(DATA *data, threadData_t *threadData)
   {
+    TRACE_PUSH
     long i=0, j=0;
     <%body%>
+    TRACE_POP
   }
   >>
 end functionInitSynchronous;
@@ -344,6 +346,7 @@ template functionUpdateSynchronous(list<ClockedPartition> clockedPartitions, Str
   /* Update the base clock. */
   void <%symbolName(modelNamePrefix,"function_updateSynchronous")%>(DATA *data, threadData_t *threadData, long i)
   {
+    TRACE_PUSH
     <%varDecls%>
     modelica_boolean ret;
     switch (i) {
@@ -352,6 +355,7 @@ template functionUpdateSynchronous(list<ClockedPartition> clockedPartitions, Str
         throwStreamPrint(NULL, "Internal Error: unknown base partition %ld", i);
         break;
     }
+    TRACE_POP
   }
   >>
 end functionUpdateSynchronous;
@@ -397,8 +401,8 @@ template functionSystemsSynchronous(list<SubPartition> subPartitions, String mod
   /*Clocked systems equations */
   int <%symbolName(modelNamePrefix,"function_equationsSynchronous")%>(DATA *data, threadData_t *threadData, long i)
   {
-    int ret;
     TRACE_PUSH
+    int ret;
 
     switch (i) {
       <%cases%>
diff --git a/SimulationRuntime/c/simulation/solver/synchronous.c b/SimulationRuntime/c/simulation/solver/synchronous.c
index 098ea77ff33..1136ead2dad 100644
--- a/SimulationRuntime/c/simulation/solver/synchronous.c
+++ b/SimulationRuntime/c/simulation/solver/synchronous.c
@@ -115,6 +115,7 @@ void checkForSynchronous(DATA *data, SOLVER_INFO* solverInfo)
 
 void fireClock(DATA* data, threadData_t *threadData, long idx, double curTime)
 {
+  TRACE_PUSH
   const CLOCK_INFO* clk = data->modelData.clocksInfo + idx;
   CLOCK_DATA* clkData = data->simulationInfo.clocksData + idx;
   data->callback->function_updateSynchronous(data, threadData, idx);
@@ -139,7 +140,7 @@ void fireClock(DATA* data, threadData_t *threadData, long idx, double curTime)
       insertTimer(data->simulationInfo.intvlTimers, &nextTimer);
     }
   }
-
+  TRACE_POP
 }
 
 static void handleBaseClock(DATA* data, threadData_t *threadData, long idx, double curTime)