There is a good fix for that black and night. Stop forcing people to self-identify by their skin tone. Leave it as a descriptor, like weight and height, instead of a group identity. The first step is for the government itself to stop.

This is also why they didn't want the citizenship question. It makes people aware of their American identity.