Let's not modify Microsoft's code to fix this, it should be fixable purely from our end in our wrapper.