fixed issue #716