GC, perfomance fix more