fixed calendar issue