Fixed Build Stage order