Thanks, sounds correct. Could we handle this separately (as it affects many other places as well)? You can create a new issue for it, or I could do it.