fixed timestamping issues