Fix loopless trasport implementation