NXP-10722 fix bad use of scoped values