1 files changed, 6 insertions, 1 deletions
diff --git a/Carpet/CycleClock/src/clock.cc b/Carpet/CycleClock/src/clock.cc
index 26e251ca1..da9a41d09 100644
--- a/Carpet/CycleClock/src/clock.cc
+++ b/Carpet/CycleClock/src/clock.cc
@@ -1,6 +1,7 @@
 #include "cycleclock.h"
 
 #include <cctk.h>
+#include <cctk_Parameters.h>
 
 #include <cmath>
 
@@ -169,8 +170,12 @@ namespace CycleClock {
   extern "C"
   int CycleClock_Setup()
   {
+    DECLARE_CCTK_PARAMETERS;
+    
     measure_tick();
-    cycleclock_register();
+    if (register_clock) {
+      cycleclock_register();
+    }
     return 0;
   }