Work on issue #329