Fixing issue #340.