Fix for the cases where a dynamic build is used
Merging with fix_windows_zip