The way that is fixed is changing the tax laws so they "pay what they should" - not vaguely pretextual shakedowns to try to score political points. It isn't neccessary.
Legally US companies are doing exactly what they should even if it involves bullshit loopholes like Double Dutch Irish or large licensing fees. If they weren't then there would many within facing charges of tax evasion. The actual solution would involve closing loopholes with things like excluding license fees and business from profit reductions for tax purposes.