Fixing addToCalendar