Anton/fix cc button

@auraz, @olmar and @valera-rozuvan please review