Fixing the CC popover