Fixed issue #761