Possible Bugfix for newer Elasticsearch Versions