Fixed the timestamp retrieval bug