Fixup after 6702a49