Fixing issue #331.