Fix a timestamp bug