Attempt to fix #507

It seems it worked, down to only 4 failures now