diff --git a/src/main/java/com/kosherjava/zmanim/AstronomicalCalendar.java b/src/main/java/com/kosherjava/zmanim/AstronomicalCalendar.java
index 73f32528..04f829d6 100644
--- a/src/main/java/com/kosherjava/zmanim/AstronomicalCalendar.java
+++ b/src/main/java/com/kosherjava/zmanim/AstronomicalCalendar.java
@@ -650,6 +650,8 @@ protected Date getDateFromTime(double time, SolarEvent solarEvent) {
 			cal.add(Calendar.DAY_OF_MONTH, 1);
 		} else if (solarEvent == SolarEvent.MIDNIGHT && localTimeHours + hours < 12) {
 			cal.add(Calendar.DAY_OF_MONTH, 1);
+		} else if (solarEvent == SolarEvent.NOON && localTimeHours + hours > 24) {
+			cal.add(Calendar.DAY_OF_MONTH, -1);
 		}
 
 		cal.set(Calendar.HOUR_OF_DAY, hours);