Thanks to you both for the quick solution and the upstream fix.