Bugfix for https://savannah.cern.ch/bugs/?97755