Personally, I think the best way to help fix this issue is to stop separating people into groups at all.
Bring this up as a subject it you have too.
The less you separate people into and reinforce groups, the less others will.
Otherwise, we’ll all continue to see situations where sex, race etc come up when it really shouldn’t.