More work on issue #1442