Fixing scoping