Fixed collision handling