Fixed Timestamp issue