Fixed for dynamic library