Make the libtool fix more dynamic