Glad to help. Just FYI, the change is published for 2.0, still incorrect for 1.8, if you have cycle to backport to the 1.8 version, which we are still running.
I submitted what I think is a PR to backport this change to the 1.8 branch. Hope I did it right.