Same fix as in 3.4.5 and master