Close #7; fix #12