Fix the PR

I think this can be tightened up a lot, but for now, it's fine.