OK, that seemed to work. @bradh  - I submitted a pull request to your branch so hopefully you can pull that in and then update this request with the change.