Collision improved a lot but still a bug