diff --git a/libgnucash/engine/gnc-date.cpp b/libgnucash/engine/gnc-date.cpp
index b5f2acb948..f8c45fa689 100644
--- a/libgnucash/engine/gnc-date.cpp
+++ b/libgnucash/engine/gnc-date.cpp
@@ -126,7 +126,7 @@ gnc_localtime_r (const time64 *secs, struct tm* time)
 }
 
 static void
-normalize_time_component (int *inner, int *outer, unsigned int divisor,
+normalize_time_component (int *inner, int *outer, int divisor,
                           int base)
 {
      while (*inner < base)
@@ -134,7 +134,7 @@ normalize_time_component (int *inner, int *outer, unsigned int divisor,
           --(*outer);
           *inner += divisor;
      }
-     while (*inner > static_cast<gint>(divisor))
+     while (*inner >= divisor + base)
      {
           ++(*outer);
           *inner -= divisor;