Make calendars work again