Fixing issue #326.