diff --git a/src/mm_sol_nonlinear.c b/src/mm_sol_nonlinear.c
index fcb54978..86b74104 100644
--- a/src/mm_sol_nonlinear.c
+++ b/src/mm_sol_nonlinear.c
@@ -705,10 +705,6 @@ int solve_nonlinear_problem(struct GomaLinearSolverData *ams,
     DPRINTF(stdout, "-------");
   DPRINTF(stdout, "\n");
 
-  if (Num_ROT == 0 /*&& inewton == 0*/ && exo->num_dim == 3) {
-    setup_rotated_bc_nodes(exo, dpi, BC_Types, Num_BC, x);
-  }
-
   // Setup turbulence information
   if (upd->turbulent_info->use_internal_wall_distance) {
     bool already_setup = true;
@@ -730,6 +726,11 @@ int solve_nonlinear_problem(struct GomaLinearSolverData *ams,
     }
   }
 
+  // 3D Automatic rotation setup
+  if (Num_ROT == 0 /*&& inewton == 0*/ && exo->num_dim == 3) {
+    setup_rotated_bc_nodes(exo, dpi, BC_Types, Num_BC, x);
+  }
+
   /*********************************************************************************
    *
    *                         Top of the Newton Iteration Loop