Close #34 and Close #35