Same fix as in 4.X/Master