Fix bug from Core Vendor