Fixing issue #332.