Fixed make_vectors