Resolved calendar issue