Work on issue #349