#CC-12 fixed