Fixed build sequence