Now it's really really fixed

But i should test some more.