fixed timestamp bug