Fixing issue #764