wi-23925 Fix to Calendar issue on bigCalendar