Close #361