Fix dynamic loading