bug fix: calendar issue