apply corrections suggested by Daniel Bünzli