More work on issue #68