diff --git a/__tests__/EightChar.test.js b/__tests__/EightChar.test.js
index 8929c3e..f05f03b 100644
--- a/__tests__/EightChar.test.js
+++ b/__tests__/EightChar.test.js
@@ -177,3 +177,7 @@ test('test11', () => {
   expect(eightChar.getDay()).toBe('庚子');
   expect(eightChar.getTime()).toBe('戊子');
 });
+
+test('test12', () => {
+  expect(Solar.fromYmdHms('1999', '06', '07', '09', '11', '00').getLunar().getEightChar().toString()).toBe('己卯 庚午 庚寅 辛巳');
+});
diff --git a/lunar.js b/lunar.js
index 7d7129d..ae21983 100644
--- a/lunar.js
+++ b/lunar.js
@@ -514,9 +514,13 @@
         offsetYear += 60;
       }
       var startYear = today.getYear() - offsetYear - 1;
-      while (startYear >= baseYear) {
+      while (true) {
         years.push(startYear);
         startYear -= 60;
+        if (startYear < baseYear) {
+          years.push(baseYear);
+          break;
+        }
       }
       var hour = 0;
       var timeZhi = timeGanZhi.substr(1);