Fixing issue #681