Fix for vendor ordering