Fixup from previous commit