Work on issue #346