Fixup, pt 2