legacy system build fix