Close #32, #35