more resilient timestamp handling