Work on issue #241