Close #344