Another fix for initial load of calendar