Fixed timestamp bug