Fix CM reader