timestamp bug fix