Fixup for 9574150