fixing for compatibility with merged cdmlib