Migrated
 Hack to fix current_vendor