Close #244