Fix - put variables in correct scope.