Another attempt to make build work correctly.