Close #399