GH1141: Different fix, preferred by Richard.