Solr fix for #605