updated for CMSSW_4_2_10_patch2