Stabilize vendors
Bugfix #213