fix mac bug
fix more mac bug