More work on issue #346