Bug fix on linking vendors