Fixing issue #685