OpenSearch - correct issue #14