more work on issue #111