diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java
index 8e823bb4c..52dc2a615 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java
@@ -131,14 +131,8 @@ public class StretchesFunction extends AssignmentFunction {
                 LocalDate startInclusive, LocalDate taskEnd,
                 int intervalHours) {
             Validate.isTrue(!isConsolidated());
-
-            // End has to be exclusive on last Stretch
-            LocalDate endDate = getEnd();
-            if (endDate.equals(taskEnd)) {
-                endDate = endDate.plusDays(1);
-            }
             resourceAllocation.withPreviousAssociatedResources()
-                    .onInterval(getStartFor(startInclusive), endDate)
+                    .onInterval(getStartFor(startInclusive), getEnd())
                     .allocateHours(intervalHours);
         }
 
diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java
index 037fc6c17..b2dbd31fd 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunctionTypeEnum.java
@@ -216,7 +216,8 @@ public enum StretchesFunctionTypeEnum {
         intervals.addAll(stretchesFunction.getIntervalsDefinedByStreches());
 
         LocalDate startInclusive = resourceAllocation.getFirstNonConsolidatedDate();
-        LocalDate endExclusive = resourceAllocation.getEndDate();
+        LocalDate endExclusive = resourceAllocation.getIntraDayEndDate()
+                .asExclusiveEnd();
         int totalHours = resourceAllocation.getNonConsolidatedHours();
         apply(resourceAllocation, intervals, startInclusive, endExclusive, totalHours);
     }