Fixed issue #689