Fix scope.

Another fix for Bug: 13642
BFN