Bugfixes: still not working