diff --git a/src/main/java/com/nlf/calendar/Solar.java b/src/main/java/com/nlf/calendar/Solar.java
index a973507..b6448ae 100644
--- a/src/main/java/com/nlf/calendar/Solar.java
+++ b/src/main/java/com/nlf/calendar/Solar.java
@@ -293,9 +293,13 @@ public static List<Solar> fromBaZi(String yearGanZhi, String monthGanZhi, String
       offsetYear += 60;
     }
     int startYear = today.getYear() - offsetYear - 1;
-    while (startYear >= baseYear) {
+    while (true) {
       years.add(startYear);
       startYear -= 60;
+      if (startYear < baseYear) {
+        years.add(baseYear);
+        break;
+      }
     }
     int hour = 0;
     String timeZhi = timeGanZhi.substring(1);