further bugfixing