Fix cms-sw/cmssw#1826