bugfix + RC2