++ Fixing break in scope