Further work on issue #5