ported to this repo the fix to bug https://savannah.cern.ch/bugs/index.php?98280