fixed to work with new version of CMS2.h/cc