Fixed: possible scope resolution problem