Needs the same fix as in the previous PR.