Ian, can you have a quick look at the patch? I will commit if you approve. Thanks.