Close #377