Updated to fix bug build [cb7ed6affe] in build script -- need a better solution