Temp fix for calendars