fixed Scope problem except #26