JK: Another attempt at fixing the calendar grouping.