bugfixing after Testing beta3