Another BuildHive fix attempt