fixed(?) collision detection

need test