Fixing tooltip changes in CC