Fixing issue #472