Fix pipe-collision