Fixed calendar issue