Finally happy with the timestamp correction