Hopefully a fix for tests.