add bugfixing