Fix calendar granularity

#2611