should close #241