Timestamps parse fix