The simple way to fix this is to remove the indentured servitude. In a fair market, labor is free to move around. Overnight, the incentive for companies to hire H1Bs go out the door, because all the advantages of doing so (below market servitude for years) disappears.