Finally fix dynamic loading.