Same fix as described in prior commit with less code.