Elasticsearch fix