Fixed issue with CD