Improve the handling of the timestamp.