Hotfix for accidental captures introduced by alternative finding in NameFix