Fix collision handling errors