Ok, I'll include that in the PR with the fixes and tests for this one...