Fix find variables in scope