Fixed Timestamp Bug