Fixing issue #1322