issue #824 fixed