Bugfixing the bugfix