Fixed issue #241