Fixed Build process