Fixing issue #416