diff --git a/src/binary_c_macros.h b/src/binary_c_macros.h
index 98b72131c3545a870da4591a663497610cc60de4..c24b6d2d1c2041cc70a4564a0ec24ca4a7f27183 100644
--- a/src/binary_c_macros.h
+++ b/src/binary_c_macros.h
@@ -836,6 +836,7 @@
         "HG fractional envelope",               \
     }
 
+
 #define NOVA_STATE_NONE 0
 #define NOVA_STATE_TRIGGER 1
 #define NOVA_STATE_POST 2
diff --git a/src/evolution/evolution_difflog.c b/src/evolution/evolution_difflog.c
index 46a6af0a98dc77686e0cfb77e577af2ef59fbd2f..3b605207ea7da2920cecf7643b9d03325705a76c 100644
--- a/src/evolution/evolution_difflog.c
+++ b/src/evolution/evolution_difflog.c
@@ -475,7 +475,7 @@ static void cf_diffstats(struct stardata_t * RESTRICT const stardata,
         {
             const Boolean novae =
                 stardata->preferences->individual_novae == TRUE ?
-                Boolean_(now->novastate[k] != NOVA_STATE_NONE) :
+                Boolean_(now->novastate[k] == TRUE) :
                 Boolean_(now->novarate[k] < 0.0);
             
             if((novae == TRUE) &&
diff --git a/src/timestep/timestep_limits.c b/src/timestep/timestep_limits.c
index 5359f09de1569395b1809abd98c1c1f7b216bcf7..26c9f38e61c9ba49d5183377794df6d64c523780 100644
--- a/src/timestep/timestep_limits.c
+++ b/src/timestep/timestep_limits.c
@@ -289,6 +289,7 @@ void timestep_limits(Timestep_prototype_args)
                                                             star->mass);
                     }
 
+#ifdef __DEPRECATED
                     if(star->novastate == NOVA_STATE_TRIGGER)
                     {
                         /* 
@@ -322,7 +323,12 @@ void timestep_limits(Timestep_prototype_args)
                          */
                         dtlim = stardata->preferences->timestep_multipliers[DT_LIMIT_NOVAE] * star->dtnova;
                     }
+#endif
 
+                    star->dtnova = nova_recurrence_time(accretion_rate,
+                                                            star->mass);
+                    dtlim = stardata->preferences->timestep_multipliers[DT_LIMIT_NOVAE] * star->dtnova;
+                    
                     dtlim *= 1e-6; // convert to Myr
                     
                     /*