Fixup pattern handling