Fix for the cases where a dynamic build is used