Close #337