Fix more vector issue