Fixing issue #736