this seems to fix all tests