My fix for #851 actually broke my earlier fix for #850; this patch corrects things so they play nice together.
My fix for #851 actually broke my earlier fix for #850; this patch corrects things so they play nice together.

IreneKnapp/Faction,IreneKnapp/Faction