issue #830 completed