Fixing issue #752