fixed issue #900