fixed CalendarFactory