Fixed issue #707