Fixing issue #743