Yes... that i was also thinking while editing RC2.php :-)
Have to do this.