More work on issue #1500