diff --git a/src/flatpickr.js b/src/flatpickr.js
index fcad068be..485ad1b3d 100644
--- a/src/flatpickr.js
+++ b/src/flatpickr.js
@@ -786,7 +786,7 @@ function Flatpickr(element, config) {
 
 	function handleYearChange(newYear) {
 		if (self.currentMonth < 0 || self.currentMonth > 11) {
-			self.currentYear += self.currentMonth % 11;
+			self.currentYear += (self.currentMonth > 11 ? 1 : -1);
 			self.currentMonth = (self.currentMonth + 12) % 12;
 
 			triggerEvent("YearChange");
diff --git a/test/flatpickr.spec.js b/test/flatpickr.spec.js
index 2b962f443..f967af71f 100644
--- a/test/flatpickr.spec.js
+++ b/test/flatpickr.spec.js
@@ -317,6 +317,11 @@ describe('flatpickr', () => {
 
 			fp.changeMonth(2);
 			expect(fp.currentMonth).toEqual(1);
+			expect(fp.currentYear).toEqual(2017);
+
+			fp.changeMonth(14);
+			expect(fp.currentYear).toEqual(2018);
+			expect(fp.currentMonth).toEqual(3);
 		});
 
 		it("destroy()", () => {