fixing control flow variables finding