How do you fix poverty? By having a safety net not full of holes like swiss cheese.

You don't fix a vicious cycle by addressing only one aspect. So yes, we have to fix both. Then it will become a mutually reinforcing cycle like it used to be.