diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java b/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java
index 40bf22cea..5760bc08d 100644
--- a/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java
+++ b/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java
@@ -239,9 +239,11 @@ public class PeriodHelper {
 				return date;
 
 			ZonedDateTime result = date.plusDays(shiftDays);
-			if (result.isBefore(end))
-				return result;
-			return date.plusDays(shiftDays - 1);
+			while (!result.isBefore(end)) {
+				shiftDays--;
+				result = date.plusDays(shiftDays);
+			}
+			return result;
 		}
 
 		if (!period.isZero())