Fixed Timestamp bug