Fixup after previous commit