diff --git a/src/freq_ctr.c b/src/freq_ctr.c
index 28f5936..6dec970 100644
--- a/src/freq_ctr.c
+++ b/src/freq_ctr.c
@@ -47,7 +47,7 @@
 	if (past <= 1 && !curr)
 		return past; /* very low rate, avoid flapping */
 
-	return curr + mul32hi(past, ~curr_sec_ms_scaled);
+	return curr + mul32hi(past, ms_left_scaled);
 }
 
 /* returns the number of remaining events that can occur on this freq counter
@@ -59,7 +59,6 @@
 	unsigned int curr, past;
 	unsigned int age;
 
-	past = 0;
 	curr = 0;		
 	age = now.tv_sec - ctr->curr_sec;
 
@@ -69,7 +68,7 @@
 			curr = past;
 			past = ctr->prev_ctr;
 		}
-		curr += mul32hi(past, ~curr_sec_ms_scaled);
+		curr += mul32hi(past, ms_left_scaled);
 	}
 	curr += pend;
 
@@ -99,7 +98,7 @@
 			curr = past;
 			past = ctr->prev_ctr;
 		}
-		curr += mul32hi(past, ~curr_sec_ms_scaled);
+		curr += mul32hi(past, ms_left_scaled);
 	}
 	curr += pend;