Fix collide, returns None no more