Fix vessel linkage with looping