Bug fix for Calendar month off-by-one bug