bugfixing again