Yes it does - feel free to test and fix that on the master branch, and I'll rebase this experimental branch before any merge is agreed. Thanks!