Bugfixing again