Fixing issue #923