Fixing vectorization.