issue #847 fixed