Fix for common-gender surnames