Fixed the timestamp parsing