Corrected vectorization