Fixing issue #683