bugfixing done