Fix problem with timestamp