issue #920 fixed