more work on issue #61