I believe I suggested what you can do to fix this, without having to wait for this code change? That should be part of this commit, to test everything.