Fixing issue #324.