Close #345