++ Scope break fix