Close #31 and #32.