Fix issue with multiple vars with the same uid.
Fix issue with multiple vars with the same uid.

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