this pr is just from my master branch, so it appears it was added after the fact.

However I am unsure if we have a scenario that is like this, so I guess we can merge it along with this