Let's Try This

I think I found a workaround for the issue I'm having.

I'm asking for a pull request to sync your repo to mine and then I'm going to send another pull request the other way around... it's the easiest way I found.