workaround for infinite recursion during local variable access
fix
Merge branch 'localworkaround'