Close #241