Fix cms-sw/cmssw#5607
Merge pull request #124 from ktf/fix-5607

Fix cms-sw/cmssw#5607