Version that fixes the tests too!