Fix bug in Timestamp