more bugfixing :)