Close #336