Fix collision detections