bugfixing the bugfix