Bugfixing in the vectorizer.