diff --git a/Examples/KerrBH/KerrBHLevel.cpp b/Examples/KerrBH/KerrBHLevel.cpp
index 5488e66f6..c0d41168f 100644
--- a/Examples/KerrBH/KerrBHLevel.cpp
+++ b/Examples/KerrBH/KerrBHLevel.cpp
@@ -47,8 +47,18 @@ void KerrBHLevel::initialData()
         m_state_new, m_state_new, INCLUDE_GHOST_CELLS);
 
     fillAllGhosts();
-    BoxLoops::loop(GammaCalculator(m_dx), m_state_new, m_state_new,
-                   EXCLUDE_GHOST_CELLS);
+    if (m_p.max_spatial_derivative_order == FourthOrderDerivatives)
+    {
+        GammaCalculator<FourthOrderDerivatives> my_gamma_calculator(m_dx);
+        BoxLoops::loop(my_gamma_calculator, m_state_new, m_state_new,
+                    EXCLUDE_GHOST_CELLS);
+    }
+    else if (m_p.max_spatial_derivative_order == SixthOrderDerivatives)
+    {
+        GammaCalculator<SixthOrderDerivatives> my_gamma_calculator(m_dx);
+        BoxLoops::loop(my_gamma_calculator, m_state_new, m_state_new,
+                    EXCLUDE_GHOST_CELLS);
+    }
 
 #ifdef USE_AHFINDER
     // Diagnostics needed for AHFinder
diff --git a/Tests/ApparentHorizonFinderTest3D/ApparentHorizonTest3DLevel.hpp b/Tests/ApparentHorizonFinderTest3D/ApparentHorizonTest3DLevel.hpp
index f86247e3b..518de8c17 100755
--- a/Tests/ApparentHorizonFinderTest3D/ApparentHorizonTest3DLevel.hpp
+++ b/Tests/ApparentHorizonFinderTest3D/ApparentHorizonTest3DLevel.hpp
@@ -82,8 +82,19 @@ class ApparentHorizonTest3DLevel : public GRAMRLevel
 
         // Gamma's are not needed
         // fillAllGhosts();
-        // BoxLoops::loop(GammaCalculator(m_dx), m_state_new, m_state_new,
-        // EXCLUDE_GHOST_CELLS);
+        // fillAllGhosts();
+        /*if (m_p.max_spatial_derivative_order == FourthOrderDerivatives)
+        {
+            GammaCalculator<FourthOrderDerivatives> my_gamma_calculator(m_dx);
+            BoxLoops::loop(my_gamma_calculator, m_state_new, m_state_new,
+                        EXCLUDE_GHOST_CELLS);
+        }
+        else if (m_p.max_spatial_derivative_order == SixthOrderDerivatives)
+        {
+            GammaCalculator<SixthOrderDerivatives> my_gamma_calculator(m_dx);
+            BoxLoops::loop(my_gamma_calculator, m_state_new, m_state_new,
+                        EXCLUDE_GHOST_CELLS);
+        }*/
     }
 
     virtual void specificEvalRHS(GRLevelData &a_soln, GRLevelData &a_rhs,