Work on issue #328