Fixing issue #1301