Again, bugfixing