Better collision handling