Rejigging fix for #19 without intermediate commit.