Upgraded to work in CMSSW_6_2_0_SLHC12_patch1