Fixup again, this time without duplicate lines