rest of the bug fix in build.ps1 (file not saved...)
Merge branch 'rest_of_bug_fix_in_build_ps1'