fixed bugs in CD