Fixed bug with timestamp