Fixed the issues with JCalendar, with matt