Correct collision resolution