Fixing issue #695