Proper collision resolution