Fixed bug with timestamps