Work on issue #344