Close #170 and close #176.