fixed scope issues