Fix issue #241