Work on issue #320