Fix for calendar model