NoRookie CC bugfix