calendar issue fix