Work on issue #241
Work on issue #176