From Pere: This patch fixes the problem reported by Jan at https://savannah.cern.ch/bugs/?83017
Changed paths: