Fix timestamp bug