partial fix for calendar