fix more namespace bugsgs