Fix the problem of timeStamp