Fixing issue with vendors