even more Bugfixing