Work on issue #348