Apply fix as well