Fixup for previous commit