Updated code to fix default VendorId issue.