diff --git a/Harptos/Internal/Calendar.swift b/Harptos/Internal/Calendar.swift
index e3d78e4..02b8caa 100644
--- a/Harptos/Internal/Calendar.swift
+++ b/Harptos/Internal/Calendar.swift
@@ -26,7 +26,7 @@ class Calendar {
         let leapDaySeconds = Float(year) / 4 * Float(Constants.secondsPerDay)
         let remainingYearSeconds = epoch - (year * Constants.secondsPerYear) - Int(leapDaySeconds)
         var day = Int(remainingYearSeconds / Constants.secondsPerDay)
-        if day == 0 { day = 1} // if we've arrived in a new year, start on day 1
+        if day == 0 { day = 1 } // if we've arrived in a new year, start on day 1
         
         var segment: YearTimeSegment = YearTimeSegment.allCases.first!
 
@@ -37,7 +37,7 @@ class Calendar {
             
             if isLeapYear(year) == false && aSegment == .shieldmeet { continue }
             
-            if day >= segmentDays {
+            if day > segmentDays {
                 day -= segmentDays
             } else {
                 break