More work on issue #1122