Bugfixing a bit more, for fun