Hopefully final fix for these random failures