Fixing issue #746