Better collision resolution