Build correctly