bugfixing for real