Fix Performance for calendar