Matt Robson, thanks for the verification. The fix is definitely needed, but have a couple of comments on Guillaume Nodet's PR that might help clean things up even more.