Fix logic to successfully system build