Another scoping "fix"