Timestamp Bug Solved