The only solution to political correctness is to:
- Take great care with what you say,
- Not care what other people think when you say it; and
- Never take offense at what others say, when they intend to be reasonable.
If enough people will do this, this problem will go away -- but for enough people to do this, they will have to be taught.