fix future dates logic