more bugfixing again