fix more problem with Thomas help