Fixed issue with calendar loading