Another fix for the BuildClient