Fixing issue #1034