RC2 bugfix