fix more scale bugs