Work on issue #345