Fix more the type