Adding RC2 resolved bugs