Fix/vendor tag

I hope this is the correct way ...