Fix CDM loading