Fixed issue with timestamp parsing