Fixed issue #868