Fixing issue #1050