Close #307