issue #715 fixed