Add hack for calendar