Bug fix: environment shadowing (thanks to Steelworks for the fix)