More work on issue #1291