BO + vendor fix