diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp
index bbc99d0..abe1939 100644
--- a/scheduler/schedule.cpp
+++ b/scheduler/schedule.cpp
@@ -42,11 +42,14 @@ int SensorScheduler::StartSchedule(uint16_t short_addr, int &next_duration, bool
     }    
 
     if (ts_in_eigen_slice_) {
-        nth_eigen_slice_ = (seconds_in_current_eigen_slice_ + 2) / eigen_value_send_duration_;
+        // nth_eigen_slice_ = (seconds_in_current_eigen_slice_ + 2) / eigen_value_send_duration_;
         if (nth_eigen_value_slice_ == 0) {
             ClearFailureSuccessMap();
         }
     } else {
+        if (seconds_per_wave_slice_ == 0) {
+            seconds_per_wave_slice_ = 60;
+        }
         nth_wave_slice_ = (seconds_in_current_eigen_slice_ - 60 + 3) / seconds_per_wave_slice_;
     }  
     zlog_debug(zbt, "[%d:%x] ts:%ld, current utc:%s, nth eigen_value slice:%d, seconds in eigen slice:%d, eigen slice:%d",