diff --git a/src/simulation/m_rhs.fpp b/src/simulation/m_rhs.fpp
index cf1022f14..d9617f930 100644
--- a/src/simulation/m_rhs.fpp
+++ b/src/simulation/m_rhs.fpp
@@ -774,10 +774,8 @@ contains
             end if
             irx%end = m; iry%end = n; irz%end = p
 
-            call nvtxStartRange("RHS-RIEMANN-SOLVER")
-
             ! Computing Riemann Solver Flux and Source Flux
-            call nvtxStartRange("RHS_riemann_solver")
+            call nvtxStartRange("RHS-RIEMANN-SOLVER")
             call s_riemann_solver(qR_rsx_vf, qR_rsy_vf, qR_rsz_vf, &
                                   dqR_prim_dx_n(id)%vf, &
                                   dqR_prim_dy_n(id)%vf, &
diff --git a/src/simulation/m_time_steppers.fpp b/src/simulation/m_time_steppers.fpp
index fbe443a2d..2ffbc8e58 100644
--- a/src/simulation/m_time_steppers.fpp
+++ b/src/simulation/m_time_steppers.fpp
@@ -390,7 +390,6 @@ contains
         end if
 
         if (bodyForces) call s_apply_bodyforces(q_cons_ts(1)%vf, q_prim_vf, rhs_vf, dt)
-        call nvtxEndRange
 
         if (grid_geometry == 3) call s_apply_fourier_filter(q_cons_ts(1)%vf)
 
@@ -406,6 +405,8 @@ contains
             end if
         end if
 
+        call nvtxEndRange
+
     end subroutine s_1st_order_tvd_rk
 
     !> 2nd order TVD RK time-stepping algorithm