Close #109.
regen for 9f4891a