Fix issue #695