Fix vectorizer