Fix calendar initial load