I *think* this should fix up the gender/plural disagreements mentioned in #442