Fixing issue #735