fix to RC2