Index: src/java/org/quartz/SimpleTrigger.java
===================================================================
--- src/java/org/quartz/SimpleTrigger.java	(revision 656)
+++ src/java/org/quartz/SimpleTrigger.java	(working copy)
@@ -681,9 +681,17 @@
      * </p>
      */
     public Date getNextFireTime() {
+        Date now = new Date();
+        while (nextFireTime != null 
+            && nextFireTime.before(now)
+            && nextFireTime.getSeconds() != now.getSeconds() 
+            ) 
+        {
+            nextFireTime = getFireTimeAfter( now );
+        }
         return nextFireTime;
     }
-
+    
     /**
      * <p>
      * Returns the previous time at which the <code>SimpleTrigger</code> will