Fixed #241