Fixed bug with month granularity