Fixed timestamping issue