Improve handling of stale timestamps

Fixes issue #8.