fixed breaking changes in generation of CCDA