Truly fixed addToCalendar