Fix/cc 442