Same fix as for 4.0