Fixup for 410c0f5