Fix issue with incorrect date excluding