more work on issue #694