Work on issue #1328