RC2 compatibility