Fix for CalendarPanel drawing bug