Close #338