Fix timestamp issues coming from the future!