Fixup for 3793077