Fixed scoping in last commit