Fixed issue #716