Rare bug / Last day of the month not being added to 'Upcoming' calculation