Build Script fixed