Cap 172 fix predefined calendars