fix more conflicts between suit and nested