Doesn't update correctly when cycling. (cherry picked from commit fc0ff8fb313d8dfddf803c19a19bf2629ce89e90)