Fix for timestamping error