fix more code >.>