Ok, you got me there. I will have to re-think this PR.