A remedy for the gap between micro and macro data, making measures of inequality and national income consistent with each other