fix fullcalendar issue
fix calendar issue 2