DOI issue - another try
* #1959