Fixing issue #299.