Fix logic and a reference to port origin
Fix logic and a reference to port origin

Open343/pkg,junovitch/pkg,junovitch/pkg,skoef/pkg,en90/pkg,Open343/pkg,en90/pkg,skoef/pkg,khorben/pkg,khorben/pkg,khorben/pkg