Work on issue #176
Work on issue #241