Ok, that seems to break the tests :(