retestet, bugfixing