Bug with order of builds was fixed