Fixing issue #1225