Fixing issue #354.