adjust timestamps after filtering, not before
add a test to try to repro issue #27