Fixed bug with latest build logic