Fix possible scoping issue.