Bug in CD1 fixed?!