Ha, yeah this will break when the 2nd Barbican pull request goes in. Our work is never done! :)