Adjust vendor
Exception after installation
Merge branch 'fix-2'
Merge branch 'fix-1'