Improved collision handling