Close #322