Fix build script - this time BEFORE going through a 4-hours nightmare...lol