Better collision handling for multiple hits