issue SOLR-58