Improved collision detection to have fewer false positives