diff --git a/src/main/java/org/gcube/accounting/analytics/TemporalConstraint.java b/src/main/java/org/gcube/accounting/analytics/TemporalConstraint.java
index 8252a4c..2c18fdc 100644
--- a/src/main/java/org/gcube/accounting/analytics/TemporalConstraint.java
+++ b/src/main/java/org/gcube/accounting/analytics/TemporalConstraint.java
@@ -151,7 +151,12 @@ public class TemporalConstraint {
 	}
 	
 	public Calendar getAlignedEndTime(){
-		return getAlignedCalendar(endTime, aggregationMode);
+		Calendar calendar = getAlignedCalendar(endTime, aggregationMode);
+		int ordinal = aggregationMode.ordinal();
+		int calendarToAdd = CalendarEnum.values()[ordinal].getCalendarValue();
+		calendar.add(calendarToAdd, 1);
+		calendar.add(Calendar.MILLISECOND, -1);
+		return calendar;
 	}
 	
 	public SortedSet<Calendar> getCalendarSequence(){