minor: rework fly-by detection