Fix issue #857