minor: rework fly-by detection
minor: rework fly-by detection