Resolved issue with CallendarView