Timestamp bug fix