fixed timestamp handling